logon_hg_update: fixed bugs in updating patches.

delph-in · Sep 19, 2009 · 0522f74 · 0522f74
1 parent b1f4e40
commit 0522f74
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/bin/logon_hg_update b/bin/logon_hg_update
@@ -2,13 +2,14 @@
 
 logon_hg_update () {
     HG=${1:-$HOME/logon.hg}
+    (hg -R $HOME/logon.hg qpop -a
     hg clone $HOME/logon.hg $HG && \
     hg clone $HOME/logon.patches $HG/.hg/patches && \
-    hg -R $HG qpush -a || \
-    hg -R $HG qpop -a && \
-    hg -R $HG pull && hg -R $HG update && \
-    hg -R $HG/.hg/patches pull && hg -R $HG/.hg/patches update && \
-    hg -R $HG qpush -a
+    hg -R $HG qpush -a) || \
+    (hg -R $HG qpop -a && \
+    hg -R $HG pull && hg -R $HG update -C && \
+    hg -R $HG/.hg/patches pull && hg -R $HG/.hg/patches update -C && \
+    hg -R $HG qpush -a)
 }
 
 logon_hg_update $1