Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
2020:00925397236c | 2021:fc22ed56afe3 |
---|---|
17 searching for changes | 17 searching for changes |
18 adding changesets | 18 adding changesets |
19 adding manifests | 19 adding manifests |
20 adding file changes | 20 adding file changes |
21 added 2 changesets with 1 changes to 1 files | 21 added 2 changesets with 1 changes to 1 files |
22 adding foo | |
23 merging foo | |
24 pushing to ../c | |
25 searching for changes | |
26 abort: push creates new remote branches! | |
27 (did you forget to merge? use push -f to force) | |
28 pushing to ../c | |
29 searching for changes | |
30 no changes found | |
31 pushing to ../c | |
32 searching for changes | |
33 abort: push creates new remote branches! | |
34 (did you forget to merge? use push -f to force) | |
35 pushing to ../c | |
36 searching for changes | |
37 abort: push creates new remote branches! | |
38 (did you forget to merge? use push -f to force) |