Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert @ 2109:1b183976e007
Revert push new heads logic
This breaks push -r's new head detection but fixes the common case.
For now we'll assume that someone doing push -r knows what they're doing.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 21 Apr 2006 16:30:23 -0500 |
| parents | 7544700fd931 |
| children | 890e285c52a1 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "added file1" > file1 echo "added file2" > file2 hg add file1 file2 hg commit -m "added file1 and file2" -d "1000000 0" -u user echo "changed file1" >> file1 hg commit -m "changed file1" -d "1000000 0" -u user hg -q log hg id hg update -C 0 hg id echo "changed file1" >> file1 hg id hg revert hg diff hg status hg id hg update hg diff hg status hg id hg update -C 0 echo "changed file1" >> file1 HGMERGE=merge hg update hg diff hg status hg id hg revert hg diff hg status hg id hg revert -r tip hg diff hg status hg id hg update -C hg diff hg status hg id cd ..; /bin/rm -rf t