tests/test-clone-pull-corruption.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 11 Dec 2006 18:09:52 +0100
changeset 3869 ad6f34c83c3d
parent 2175 b2ae81a7df29
child 4960 5c5d23d93447
permissions -rw-r--r--
Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../source
abort: pretxncommit hook exited with status 1
transaction abort!
rollback completed
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)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions