Mercurial > hg

comparison tests/test-double-merge.out @ 11716:db426935fa94 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
progress: use gerund (updating) for merge progress
author timeless <timeless@gmail.com>
date Fri, 30 Jul 2010 10:32:24 +0300
parents f2618cacb485
children
comparison
equal deleted inserted replaced
11715:4f9dfb54c8b5 11716:db426935fa94
15 ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf 15 ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf
16 foo: versions differ -> m 16 foo: versions differ -> m
17 foo: remote copied to bar -> m 17 foo: remote copied to bar -> m
18 preserving foo for resolve of bar 18 preserving foo for resolve of bar
19 preserving foo for resolve of foo 19 preserving foo for resolve of foo
20 update: foo 1/2 files (50.00%) 20 updating: foo 1/2 files (50.00%)
21 picked tool 'internal:merge' for bar (binary False symlink False) 21 picked tool 'internal:merge' for bar (binary False symlink False)
22 merging foo and bar to bar 22 merging foo and bar to bar
23 my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da 23 my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da
24 premerge successful 24 premerge successful
25 update: foo 2/2 files (100.00%) 25 updating: foo 2/2 files (100.00%)
26 picked tool 'internal:merge' for foo (binary False symlink False) 26 picked tool 'internal:merge' for foo (binary False symlink False)
27 merging foo 27 merging foo
28 my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da 28 my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da
29 premerge successful 29 premerge successful
30 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 30 0 files updated, 2 files merged, 0 files removed, 0 files unresolved