Mercurial > hg > pyhgsh

view tests/test-merge7.out @ 1645:c6ffedc4f11b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add removed files to the changelog file list - this should allow better detection of removed file when walking in the history (like hg log) it doesn't help for the fast path of hg log where we only look at the filelog - users of the changelog file list shouldn't assume anymore that the file still exist (anyway it won't be found in the manifest like in 5ecf05541e11) - fix the tests (some hashes changed)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 29 Jan 2006 08:38:31 +1300
parents bf6c91cb816f
children 6d50d6189269
line wrap: on
line source

pulling from ../test-a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg update' to get a working copy)
merge: warning: conflicts during merge
merging test.txt
merging test.txt failed!
pulling from ../test-a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg update' to get a working copy)
merge: warning: conflicts during merge
resolving manifests
 force None allow 1 moddirstate True linear False
 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20
 test.txt versions differ, resolve
merging test.txt
resolving test.txt
file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557
merging test.txt failed!
one
<<<<<<<
two-point-five
=======
two-point-one
>>>>>>>
three
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       7      0       0 01365c4cca56 000000000000 000000000000
     1         7       9      1       1 7b013192566a 01365c4cca56 000000000000
     2        16      15      2       2 8fe46a3eb557 01365c4cca56 000000000000
     3        31      27      2       3 fc3148072371 7b013192566a 8fe46a3eb557
     4        58      25      4       4 d40249267ae3 8fe46a3eb557 000000000000
changeset:   4:40d11a4173a8
tag:         tip
parent:      2:96b70246a118
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     two -> two-point-one

changeset:   3:50c3a7e29886
parent:      1:d1e159716d41
parent:      2:96b70246a118
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     Merge 1

changeset:   2:96b70246a118
parent:      0:b1832b9d912a
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     Numbers as words

changeset:   1:d1e159716d41
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     2 -> 2.5

changeset:   0:b1832b9d912a
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     Initial