Hg-rebase-better-than-bzr-ithelps.sh — различия между версиями
Материал из YourcmcWiki
(Новая страница: «<source lang=bash> #!/bin/sh svnadmin create test svn co file://`pwd`/test test-co cd test-co echo "helloworld" > a echo "diepeople" > b svn add a b svn ci -m "add ...») |
м |
||
| Строка 1: | Строка 1: | ||
| − | |||
#!/bin/sh | #!/bin/sh | ||
| Строка 31: | Строка 30: | ||
hg rebase -d 2 | hg rebase -d 2 | ||
hg push | hg push | ||
| − | |||
Версия 15:15, 28 апреля 2011
- !/bin/sh
svnadmin create test svn co file://`pwd`/test test-co cd test-co echo "helloworld" > a echo "diepeople" > b svn add a b svn ci -m "add a+b to svn" cd .. hg clone file://`pwd`/test test-hg cd test-co echo "tretiynah" > c svn add c svn ci -m "add c to svn" cd .. cd test-hg echo "rozoviyslonik" > d hg add d hg ci -m "add d to hg" hg pull hg merge hg ci -m "merge to hg" echo "1nah" > a hg ci -m "change a in hg"
- hg push file://`pwd`/../test # ФИГВАМ! Sorry, can't find svn parent of a merge revision.
echo "5nah" > e hg add e hg ci -m "add e to hg" hg rebase -d 2 hg push
