Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge6.out @ 2056:1f6d520557ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Polished exception handling when importing extensions: - Warning about failed import is printed on one line. - For this warning the [extensions] section key is used, because the value doesn't have to be set. - Whan a --traceback is requested, exit immediately to not mix up problems when importing an extension with other problems.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 11 Apr 2006 07:08:16 +0200
parents ced2d3620f95
children b2ae81a7df29
line wrap: on
line source

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