tests/test-merge6.out
author Bryan O'Sullivan <bos@serpentine.com>
Sun, 31 Jul 2005 18:03:46 -0800
changeset 822 b678e6d4f92d
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Attempt to yield names in sorted order when walking. This is an improvement in behaviour, but the walk and changes code still has some flaws that make sorted name presentation difficult: - changes returns tuples of names, instead of a sorted list of (name, status) pairs. - walk yields deleted names after all others.

+ hg init
+ hg add foo bar
+ hg commit -m commit text -d 0 0
+ hg clone A1 B1
+ hg remove bar
+ hg commit -m commit test -d 0 0
+ hg commit -m commit test -d 0 0
+ hg clone A1 A2
+ hg clone B1 B2
+ hg pull ../B1
pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
+ hg update -m
+ hg commit -m commit test -d 0 0
bar should remain deleted.
+ hg manifest
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
+ hg pull ../A2
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
(run 'hg update' to get a working copy)
+ hg update -m
+ hg commit -m commit test -d 0 0
bar should remain deleted.
+ hg manifest
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo