Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-bundle @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 400a4a502001 |
children | b19360aa21e9 |
line wrap: on
line source
#!/bin/sh hg init test cd test echo 0 > afile hg add afile hg commit -m "0.0" -d "1000000 0" echo 1 >> afile hg commit -m "0.1" -d "1000000 0" echo 2 >> afile hg commit -m "0.2" -d "1000000 0" echo 3 >> afile hg commit -m "0.3" -d "1000000 0" hg update -C 0 echo 1 >> afile hg commit -m "1.1" -d "1000000 0" echo 2 >> afile hg commit -m "1.2" -d "1000000 0" echo "a line" > fred echo 3 >> afile hg add fred hg commit -m "1.3" -d "1000000 0" hg mv afile adifferentfile hg commit -m "1.3m" -d "1000000 0" hg update -C 3 hg mv afile anotherfile hg commit -m "0.3m" -d "1000000 0" hg verify cd .. hg init empty hg -R test bundle full.hg empty hg -R test unbundle full.hg hg -R empty heads hg -R empty verify hg --cwd test pull ../full.hg hg --cwd empty pull ../full.hg hg -R empty rollback hg --cwd empty pull ../full.hg rm -rf empty hg init empty cd empty hg -R bundle://../full.hg log echo '[hooks]' >> .hg/hgrc echo 'changegroup = echo changegroup: u=$HG_URL' >> .hg/hgrc #doesn't work (yet ?) #hg -R bundle://../full.hg verify hg pull bundle://../full.hg cd .. rm -rf empty hg init empty hg clone -r 3 test partial hg clone partial partial2 cd partial hg -R bundle://../full.hg log hg incoming bundle://../full.hg hg -R bundle://../full.hg outgoing ../partial2 cd ..