Mercurial > hg > pyhgsh
diff tests/test-push-warn.out @ 2021:fc22ed56afe3
Fix hg push and hg push -r sometimes creating new heads without --force.
Fixing issue179.
The algorithm checks if there not more new heads on the remote side than heads
which become non-heads due to getting children.
Pushing this repo:
m
/\
3 3a|
|/ /
2 2a
|/
1
to a repo only having 1, 2 and 3 didn't abort requiring --force before.
Added test cases for this and some doc strings for used methods.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 29 Mar 2006 22:35:21 +0200 |
| parents | ced2d3620f95 |
| children | 1b183976e007 |
line wrap: on
line diff
--- a/tests/test-push-warn.out Wed Mar 29 10:31:58 2006 -0800 +++ b/tests/test-push-warn.out Wed Mar 29 22:35:21 2006 +0200 @@ -19,3 +19,20 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files +adding foo +merging foo +pushing to ../c +searching for changes +abort: push creates new remote branches! +(did you forget to merge? use push -f to force) +pushing to ../c +searching for changes +no changes found +pushing to ../c +searching for changes +abort: push creates new remote branches! +(did you forget to merge? use push -f to force) +pushing to ../c +searching for changes +abort: push creates new remote branches! +(did you forget to merge? use push -f to force)