Mercurial > hg-stable
changeset 3389:efbe24c7d8d9
Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)
(Test case created by Johannes Hofmann)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sat, 14 Oct 2006 10:53:29 +0200 |
| parents | 5eecae4ff722 |
| children | a74addddd092 |
| files | tests/test-merge8 tests/test-merge8.out |
| diffstat | 2 files changed, 29 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge8 Sat Oct 14 10:53:29 2006 +0200 @@ -0,0 +1,19 @@ +#!/bin/sh + +# Test for changeset ba7c74081861 +# (update dirstate correctly for non-branchmerge updates) +hg init a +cd a +echo a > a +hg add a +hg commit -m a +cd .. +hg clone a b +cd a +hg mv a b +hg commit -m move +echo b >> b +hg commit -m b +cd ../b +hg pull ../a +hg update
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-merge8.out Sat Oct 14 10:53:29 2006 +0200 @@ -0,0 +1,10 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +pulling from ../a +searching for changes +adding changesets +adding manifests +adding file changes +added 2 changesets with 2 changes to 1 files +(run 'hg update' to get a working copy) +merging a and b +0 files updated, 1 files merged, 0 files removed, 0 files unresolved