view tests/test-rebase-issue-noparam-single-rev.out @ 9954:d6a307719ccb stable

fix bug in prepush logic involving merge changesets

When creating new branches and merging them into existing ones, you would
sometimes be able to push some changesets (the existing branches) without using
--force, even when that creates a new head on the remote.

A test which triggers the error has been added.

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