view tests/test-rebase-issue-noparam-single-rev.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 808f03f61ebe
children 4bb4895e1693
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
@  4:r2
|
o  3:r1
|
| o  2:l1
|/
o  1:c2
|
o  0:c1


% Rebase with no arguments - single revision in source branch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
rebase completed
@  4:l1
|
o  3:r2
|
o  2:r1
|
o  1:c2
|
o  0:c1

0 files updated, 0 files merged, 2 files removed, 0 files unresolved
created new head
@  4:r1
|
| o  3:l2
| |
| o  2:l1
|/
o  1:c2
|
o  0:c1


% Rebase with no arguments - single revision in target branch
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
saving bundle to 
adding branch
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
rebase completed
@  4:l2
|
o  3:l1
|
o  2:r1
|
o  1:c2
|
o  0:c1