Changes between Version 17 and Version 18 of MercurialBranches

Timestamp:

Mar 1, 2011, 12:58:27 PM (14 years ago)

Author:

Luke Plant

Comment:

--

MercurialBranches

@@ -73 +73 @@
 hg transplant $HGREV || exit 1;
 # Modify the commit message
+# We need to get added files, since after rollback this is forgotten
+ADDED=$(hg log -r tip --template '{file_adds}')
+REMOVED=$(hg log -r tip --template '{file_dels}')
 hg rollback > /dev/null || exit 1
+if [ "x$ADDED" != "x" ]
+then
+    hg add $ADDED || exit 1
+fi
+if [ "x$REMOVED" != "x" ]
+then
+    hg remove $REMOVED || exit 1
+fi
 hg commit -l hg-commit-message.txt || exit 1
 echo "Backport committed."