Mercurial > hg-stable
view tests/test-convert-clonebranches.out @ 6280:9db24a36d182
patch: check filename is /dev/null for creation or deletion (issue 1033)
Otherwise, file creation or deletion is ambiguous with file being filled or
emptied.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 16 Mar 2008 00:35:12 +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