Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-copy2 @ 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 | 94f38724283f |
children | c0b449154a90 |
line wrap: on
line source
#!/bin/sh hg init echo foo > foo hg add foo hg commit -m1 -d"0 0" echo "# should show copy" hg copy foo bar hg debugstate|grep '^copy' echo "# shouldn't show copy" hg commit -m2 -d"0 0" hg debugstate|grep '^copy' echo "# should match" hg debugindex .hg/data/foo.i hg debugrename bar echo bleah > foo echo quux > bar hg commit -m3 -d"0 0" echo "# should not be renamed" hg debugrename bar hg copy -f foo bar echo "# should show copy" hg debugstate|grep '^copy' hg commit -m3 -d"0 0" echo "# should show no parents for tip" hg debugindex .hg/data/bar.i echo "# should match" hg debugindex .hg/data/foo.i hg debugrename bar echo "# should show no copies" hg debugstate|grep '^copy' exit 0