tests/test-merge6.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 18 Aug 2005 13:58:32 -0800
changeset 942 7eb8cbcca7c4
parent 925 5a034646e472
child 990 5007e0bdeed2
permissions -rw-r--r--
Modify commands.walk to yield a 4-tuple. The new element of the tuple indicates whether a name is an exact match for one passed in on the command line.

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)
bar should remain deleted.
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
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)
bar should remain deleted.
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo