Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge10.out @ 4696:59b8f9361545
tests: add merge test for changeset 9fe267f77f56
When all the files in a directory are moved somewhere else, and new
files are added in changesets of the local branch, a subsequent pull
and merge shouldn't rename the locally added files too.
| author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
|---|---|
| date | Sat, 23 Jun 2007 22:43:46 -0500 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| 4695:c3da7b6cc975 | 4696:59b8f9361545 |
|---|---|
| 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 2 pulling from ../a | |
| 3 searching for changes | |
| 4 adding changesets | |
| 5 adding manifests | |
| 6 adding file changes | |
| 7 added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 8 (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 9 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 10 merging testdir/subdir/a and testdir/a | |
| 11 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 12 (branch merge, don't forget to commit) | |
| 13 M testdir/subdir/a | |
| 14 diff -r d02b3fc32762 testdir/subdir/a | |
| 15 --- a/testdir/subdir/a | |
| 16 +++ b/testdir/subdir/a | |
| 17 @@ -1,1 +1,1 @@ a | |
| 18 -a | |
| 19 +alpha |