tests/test-586.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 28 Nov 2008 11:38:41 +0100
changeset 7444 f792c7bb2fb3
parent 5764 8a5d8fb59ed2
child 7564 f1af59451c0c
permissions -rw-r--r--
Improvement to 14ce129cfcd: Use try/except and pass filename on errors Without the second part, the error message would be abort: Is a directory instead of abort: Is a directory: /home/user/.cvspass

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