comparison .shell.d/50.vcs_functions.sh @ 69:5232fa3d7ad3

Changes required by log being back to the default.
author Augie Fackler <durin42@gmail.com>
date Thu, 02 Apr 2009 13:43:37 -0500
parents 9f8bd97da0d4
children 5b1c3bfcf4b8
comparison
equal deleted inserted replaced
68:e4aa44f30f2c 69:5232fa3d7ad3
53 hg diff -r$targetrev:$striprev | hg import - -m "Merged branch $1." 53 hg diff -r$targetrev:$striprev | hg import - -m "Merged branch $1."
54 hg strip $striprev 54 hg strip $striprev
55 } 55 }
56 56
57 function hg-svn-rebase-all() { 57 function hg-svn-rebase-all() {
58 for b in `hg llog -u 'Augie Fackler <durin42@gmail.com>' --template '{branches}\n' | sort | uniq` 58 for b in `hg log -u 'Augie Fackler <durin42@gmail.com>' --template '{branches}\n' | sort | uniq`
59 do 59 do
60 echo "rebase $b" 60 echo "rebase $b"
61 hg co $b 61 hg co $b
62 if [[ "$?" != "0" ]] ; then 62 if [[ "$?" != "0" ]] ; then
63 echo "abort: could not checkout $b" 63 echo "abort: could not checkout $b"