Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge10.out @ 5435:d0c67b52ac01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: make contents of "extra" dict available from sources, for sinks. This breaks hash preservation for hg->hg conversion, as each converted change gets a convert_revision item added to its extra dict. Ugh.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 10 Oct 2007 15:30:00 -0700
parents 59b8f9361545
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
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)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging testdir/subdir/a and testdir/a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M testdir/subdir/a
diff -r d02b3fc32762 testdir/subdir/a
--- a/testdir/subdir/a
+++ b/testdir/subdir/a
@@ -1,1 +1,1 @@ a
-a
+alpha