Mercurial > hg
diff tests/test-rename-merge1.out @ 3251:c93ce7f10f85
merge: fixes for merge+rename
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 04 Oct 2006 19:08:04 -0500 |
| parents | c82ea81d6850 |
| children | ae85272b59a4 |
line wrap: on
line diff
--- a/tests/test-rename-merge1.out Wed Oct 04 17:59:27 2006 -0500 +++ b/tests/test-rename-merge1.out Wed Oct 04 19:08:04 2006 -0500 @@ -4,11 +4,18 @@ resolving manifests overwrite None branchmerge True partial False ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c - b: remote created -> g + a: remote moved -> c b2: remote created -> g -getting b +resolving a +my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c +copying a to b +removing a getting b2 -2 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) +M b + a +M b2 +R a +C c2 blahblah -foo