Mercurial > hg
view tests/test-convert-clonebranches.out @ 8564:6b9ec23b09fc
named branches: improve pre-push logic (issue736)
Each named branch is considered separately, and the push is allowed if
no new branch heads are created for any named branch to be pushed.
Due to some tests's use of --debug, their output will change after this
addition. This has been fixed as well.
Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Sat, 23 May 2009 17:04:31 +0200 |
| 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