Mercurial > dotfiles
comparison .shell.d/50.vcs_functions.sh @ 83:568f9f350844
hg svn rebase is now hg rebase --svn
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Mon, 13 Apr 2009 21:52:44 -0500 |
| parents | 5b1c3bfcf4b8 |
| children | 5f00625aa1ed |
comparison
equal
deleted
inserted
replaced
| 82:89f6d05cd7d5 | 83:568f9f350844 |
|---|---|
| 63 echo "abort: could not checkout $b" | 63 echo "abort: could not checkout $b" |
| 64 return | 64 return |
| 65 fi | 65 fi |
| 66 hg parent --svn > /dev/null | 66 hg parent --svn > /dev/null |
| 67 if [[ "$?" == "0" ]] ; then | 67 if [[ "$?" == "0" ]] ; then |
| 68 hg svn rebase || return | 68 hg rebase --svn || return |
| 69 else | 69 else |
| 70 echo "Skip $b since it has a merge." | 70 echo "Skip $b since it has a merge." |
| 71 fi | 71 fi |
| 72 done | 72 done |
| 73 } | 73 } |
