Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.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 | 7544700fd931 |
children | b2ae81a7df29 |
rev | line source |
---|---|
346 | 1 merge: warning: conflicts during merge |
2 merging a | |
3 merging a failed! | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
4 e7fe8eb3e180+0d24b7662d3e+ tip |
346 | 5 something else |
6 ======= | |
7 something | |
748 | 8 M a |