Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-copy2.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 | 19b048da4da9 |
children | f4dece0f7016 |
rev | line source |
---|---|
1117 | 1 # should show copy |
1127
19b048da4da9
Fixed test-copy2 with only looking at copied files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
2 copy: foo -> bar |
1117 | 3 # shouldn't show copy |
4 # should match | |
5 rev offset length base linkrev nodeid p1 p2 | |
6 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | |
7 renamed from foo:2ed2a3912a0b24502043eae84ee4b279c18b90dd | |
8 # should not be renamed | |
9 not renamed | |
10 # should show copy | |
1127
19b048da4da9
Fixed test-copy2 with only looking at copied files.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1117
diff
changeset
|
11 copy: foo -> bar |
1117 | 12 # should show no parents for tip |
13 rev offset length base linkrev nodeid p1 p2 | |
14 0 0 69 0 1 6ca237634e1f 000000000000 000000000000 | |
15 1 69 6 1 2 7a1ff8e75f5b 6ca237634e1f 000000000000 | |
16 2 75 82 1 3 243dfe60f3d9 000000000000 000000000000 | |
17 # should match | |
18 rev offset length base linkrev nodeid p1 p2 | |
19 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 | |
20 1 5 7 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 | |
21 renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 | |
22 # should show no copies |