Mercurial > hg

comparison tests/test-copy-move-merge.out @ 10490:f2618cacb485 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filelog: sort meta entries, ensure deterministic order
author Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
date Tue, 16 Feb 2010 21:04:04 +0100
parents ba5e508b5e92
children db426935fa94
comparison
equal deleted inserted replaced
10489:3232dba5d521 10490:f2618cacb485
7 c -> a * 7 c -> a *
8 b -> a * 8 b -> a *
9 checking for directory renames 9 checking for directory renames
10 resolving manifests 10 resolving manifests
11 overwrite None partial False 11 overwrite None partial False
12 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0 12 ancestor 583c7b748052 local fb3948d97f07+ remote 7f1309517659
13 a: remote moved to c -> m 13 a: remote moved to c -> m
14 a: remote moved to b -> m 14 a: remote moved to b -> m
15 preserving a for resolve of b 15 preserving a for resolve of b
16 preserving a for resolve of c 16 preserving a for resolve of c
17 removing a 17 removing a
18 update: a 1/2 files (50.00%) 18 update: a 1/2 files (50.00%)
19 picked tool 'internal:merge' for b (binary False symlink False) 19 picked tool 'internal:merge' for b (binary False symlink False)
20 merging a and b to b 20 merging a and b to b
21 my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 21 my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052
22 premerge successful 22 premerge successful
23 update: a 2/2 files (100.00%) 23 update: a 2/2 files (100.00%)
24 picked tool 'internal:merge' for c (binary False symlink False) 24 picked tool 'internal:merge' for c (binary False symlink False)
25 merging a and c to c 25 merging a and c to c
26 my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 26 my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052
27 premerge successful 27 premerge successful
28 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 28 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
29 (branch merge, don't forget to commit) 29 (branch merge, don't forget to commit)
30 -- b -- 30 -- b --
31 0 31 0