tests/test-merge6.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Apr 2006 21:01:33 +0200
changeset 2043 968f036f93a4
parent 2019 ced2d3620f95
child 2175 b2ae81a7df29
permissions -rw-r--r--
Minor fix for revert: No need to make a backup when forgetting added files. echo foo > foo && hg add foo && hg revert foo creates foo.orig, though foo is not changed or deleted.

pulling from ../B1
searching for changes
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)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo