diff options
| author | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-08-22 14:49:51 +0100 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-08-22 14:49:51 +0100 |
| commit | a498da43c7fdb9f24b73680c02a4a3588cc62d9a (patch) | |
| tree | daf8119dae1749b5165b68033a1b23a7375ce9ce /tests/test-manifest-merging.t | |
| download | mercurial-tarball-a498da43c7fdb9f24b73680c02a4a3588cc62d9a.tar.gz | |
Tarball conversion
Diffstat (limited to 'tests/test-manifest-merging.t')
| -rw-r--r-- | tests/test-manifest-merging.t | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/tests/test-manifest-merging.t b/tests/test-manifest-merging.t new file mode 100644 index 0000000..aa91cf0 --- /dev/null +++ b/tests/test-manifest-merging.t @@ -0,0 +1,37 @@ + $ hg init base + + $ cd base + $ echo 'alpha' > alpha + $ hg ci -A -m 'add alpha' + adding alpha + $ cd .. + + $ hg clone base work + updating to branch default + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ cd work + $ echo 'beta' > beta + $ hg ci -A -m 'add beta' + adding beta + $ cd .. + + $ cd base + $ echo 'gamma' > gamma + $ hg ci -A -m 'add gamma' + adding gamma + $ cd .. + + $ cd work + $ hg pull -q + $ hg merge + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + +Update --clean to revision 1 to simulate a failed merge: + + $ rm alpha beta gamma + $ hg update --clean 1 + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ cd .. |