tests/test-586.out
author Paul Moore <p.f.moore@gmail.com>
Fri, 06 Jun 2008 19:23:29 +0100
changeset 6677 9865e15febd0
parent 5764 8a5d8fb59ed2
child 7564 f1af59451c0c
permissions -rw-r--r--
Add a normalize() method to dirstate This method returns the normalised form of a path. This is - the form in the dirstate, if available, or - the form on disk, if available, or - the form passed on the command line normalize() is called on the type-'f' result of statwalk. This fixes issues 910 and 1092

adding a
adding b
pulling from ../a
searching for changes
warning: repository is unrelated
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
C b