# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1370471587 25200
# Node ID cf793eb3811e16d336ff1cc1290c71280f1dad47
# Parent  eb9d0776226f2e2593ce3602e17d114bb941204e
from https://wiki.mozilla.org/User:Asasaki:Cedar

diff -r eb9d0776226f -r cf793eb3811e bin/hg-merge-branch.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/hg-merge-branch.sh	Wed Jun 05 15:33:07 2013 -0700
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# merge a hg branch repo
+# from https://wiki.mozilla.org/User:Asasaki:Cedar
+# TODO: inclusion in mercurial utilities package
+
+if [[ "$#" != "3" ]]
+then
+    echo "Usage: hg-merge-branch.sh scheme://hg/repository"
+    exit 1
+fi
+
+if ! hg root
+then
+    exit 255
+fi
+
+# Update to latest
+# the hg up -C will blow away any local changes!
+#hg pull
+#hg up -C -r default
+
+# Pull latest branch changes in
+#hg pull $1
+#hg merge
+#hg commit -m "Merge m-c -> cedar"