Mercurial > hg

view tests/test-convert-clonebranches.out @ 6179:36ab165abbe2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: fix iterhunks() with trailing binary file removal Like some renames or copy operations, binary file removal does not generate any "file" or "hunk" action, but was not tagged as such and let iterhunk() assume no hunk was applied for the deleted file.
author Patrick Mezard <pmezard@gmail.com>
date Thu, 28 Feb 2008 00:07:37 +0100
parents 49c69e1e4aa2
children 827d4e807d57
line wrap: on
line source

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