Changes between Version 5 and Version 6 of MercurialBranches

Timestamp:

Sep 13, 2010, 2:43:03 PM (15 years ago)

Author:

Luke Plant

Comment:

--

MercurialBranches

@@ -28 +28 @@
  * Alternatively, use the [http://mercurial.selenic.com/wiki/MqExtension queues] extension to manage long lived patches.
  * To collapse several commits into a single commit before pushing back to svn, use the [http://mercurial.selenic.com/wiki/HisteditExtension histedit] extension
- * To backport a changeset from trunk, use the [http://mercurial.selenic.com/wiki/TransplantExtension transplant] extension
+ * To backport a changeset from trunk, use the [http://mercurial.selenic.com/wiki/TransplantExtension transplant] extension.  Or use this handy script which will generate the commit message for you:
+   {{{
+#!sh
+#!/bin/bash
+
+function usage {
+    echo "Usage: hg_backport <branch> <hgrevision>";
+}
+
+if [ $# -ne 2 ]
+then
+        usage;
+        exit 1;
+fi
+
+SHORTBRANCH="$1"
+BRANCH="releases/$SHORTBRANCH"
+HGREV="$2"
+
+hg st -a -r -m | grep '' > /dev/null && { echo "Working directory not clean - exiting" > /dev/stderr; exit 1; }
+
+SVNREV=`hg svn info -r $HGREV | egrep '^Revision' | cut -f 2 -d ' '`
+if [ "x$SVNREV" = "x" ]
+then
+        echo "Can't find svn rev";
+        exit 1;
+fi
+
+echo "Backporting Subversion revision $SVNREV"
+hg update $BRANCH || exit 1;
+hg transplant $HGREV || exit 1;
+# Modify the commit message
+hg log -r -1 --template "[$SHORTBRANCH] {desc}\n\nBackport of [$SVNREV] from trunk\n" > hg-commit-message.txt || exit 1
+hg rollback > /dev/null || exit 1
+hg commit -l hg-commit-message.txt || exit 1
+echo "Backport committed."
+   }}}
+   The command line is like:
+   {{{
+#!sh
+hg_backport 1.2.X 13643`
+}}}
+   where 1.2.X is a directory under 'releases/' in the Subversion repo, and 13643 is a hg revision ID.  The change is already committed, but not 'pushed', so you can still rollback if changes need to be made.
+