← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13095: Minor

 

------------------------------------------------------------
revno: 13095
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-12-02 11:54:42 +0100
message:
  Minor
modified:
  resources/util/backport


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'resources/util/backport'
--- resources/util/backport	2013-11-17 21:09:58 +0000
+++ resources/util/backport	2013-12-02 10:54:42 +0000
@@ -17,7 +17,10 @@
 fi
 
 echo "Using revision ${REV}..${TOREV}"
+bzr revert
+echo "Reverted local changes"
 bzr up
 echo "Updated branch"
 bzr merge lp:dhis2 -r ${REV}..${TOREV}
 echo "Merged revision ${TOREV}"
+echo "To commit changes: bzr commit -m \"R ${TOREV}\""