Mercurial > hg
comparison tests/test-merge8.out @ 4416:bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 08 May 2007 02:59:13 -0500 |
| parents | 4787e2b0dd03 |
| children | 0750f11152fe |
comparison
equal
deleted
inserted
replaced
| 4415:1a63b44f90c9 | 4416:bb1800a7d7e1 |
|---|---|
| 4 adding changesets | 4 adding changesets |
| 5 adding manifests | 5 adding manifests |
| 6 adding file changes | 6 adding file changes |
| 7 added 2 changesets with 2 changes to 1 files | 7 added 2 changesets with 2 changes to 1 files |
| 8 (run 'hg update' to get a working copy) | 8 (run 'hg update' to get a working copy) |
| 9 merging a and b | 9 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 10 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |