Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-grep.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 | fad2d091c74f |
children | 81f351c5264d |
rev | line source |
---|---|
1148
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
1 port:4:export |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
2 port:4:vaportight |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
3 port:4:import/export |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
4 FIXME: history is wrong here |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
5 port:1:1:-:eggs:import |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
6 port:1:2:+:eggs:vaportight |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
7 port:1:3:+:eggs:import/export |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
8 port:0:2:+:spam:export |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
9 port:0:1:+:spam:import |
fad2d091c74f
Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
10 port:4:import/export |