Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simple-update @ 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 | 0902ffece4b4 |
| children | ad3d5b4367cb |
| rev | line source |
|---|---|
|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
1 #!/bin/sh |
| 331 | 2 |
|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
3 set -e |
| 331 | 4 |
| 5 mkdir test | |
| 6 cd test | |
| 7 echo foo>foo | |
| 8 hg init | |
| 9 hg addremove | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
10 hg commit -m "1" |
| 331 | 11 hg verify |
| 12 | |
| 485 | 13 hg clone . ../branch |
| 14 cd ../branch | |
| 331 | 15 hg co |
| 16 echo bar>>foo | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
547
diff
changeset
|
17 hg commit -m "2" |
| 331 | 18 |
| 19 cd ../test | |
| 20 hg pull ../branch | |
| 21 hg verify | |
| 22 hg co | |
| 23 cat foo | |
| 485 | 24 hg manifest |