tests/test-convert-clonebranches.out
author Matt Mackall <mpm@selenic.com>
Fri, 06 Mar 2009 09:15:47 -0600
changeset 7826 f0a7accf1d68
parent 6100 49c69e1e4aa2
child 8692 827d4e807d57
permissions -rw-r--r--
setup.py: fix version detection for tarball - don't do version detection if there's no .hg directory - shrink try: clause - don't write __version__.py if version is unknown (we might overwrite the real version)

marked working directory as branch branch0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% convert
3 adda
2 addb
pulling from default into branch0
1 changesets found
1 changea
0 mergeab
pulling from default into branch0
1 changesets found
marked working directory as branch branch1
marked working directory as branch branch2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
marked working directory as branch branch3
% incremental conversion
2 c2
pulling from branch0 into branch2
2 changesets found
1 c1
pulling from branch0 into branch1
2 changesets found
0 c3
pulling from branch2 into branch3
3 changesets found
pulling from branch1 into branch3
1 changesets found