tests/test-586.out
author Matt Mackall <mpm@selenic.com>
Fri, 27 Jun 2008 14:53:30 -0500
changeset 6761 cb981fc955fb
parent 5764 8a5d8fb59ed2
child 7564 f1af59451c0c
permissions -rw-r--r--
remove: work directly off status This allows us to use a single directory walk and to trivially ignore unknown files. The resulting code is also easier to follow.

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