Mercurial > hg
view tests/test-copy-move-merge.out @ 5672:8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 27 Dec 2007 13:39:03 +0100 |
parents | 17ed9b9a0d03 |
children | 5af5f0f9d724 |
line wrap: on
line source
1 files updated, 0 files merged, 2 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0 searching for copies back to rev 1 unmatched files in other: b c all copies found (* = to merge, ! = divergent): c -> a * b -> a * checking for directory renames a: remote moved to c -> m a: remote moved to b -> m copying a to b copying a to c merging a and b my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 removing a merging a and c my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -- b -- 0 1 2 -- c -- 0 1 2