ooo-build r13128 - in trunk: . bin

[jannieuw svn gnome org]

Author: jannieuw
Date: Wed Jul  9 20:04:56 2008
New Revision: 13128
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13128&view=rev

Log:
2008-07-09  Jan Nieuwenhuizen  <janneke gnu org>

	* bin/gob-bump: Do not push back to [remote] repo, save bumped
	branch in bumped/.


Modified:
   trunk/ChangeLog
   trunk/bin/gob-bump

Modified: trunk/bin/gob-bump
==============================================================================
--- trunk/bin/gob-bump	(original)
+++ trunk/bin/gob-bump	Wed Jul  9 20:04:56 2008
@@ -105,13 +105,14 @@
 	git-checkout -b $temp_branch origin/$branch
 	if gob-update $this_branch
 	then
-		git-push
+## let's push later...
+##		git-push
 		git-checkout $this_branch
-		if git-merge $temp_branch
+ 		if git-merge $temp_branch
 		then
+## ...so preserve succesfully bumped branches locally
 ##			git-branch -d $temp_branch
-			echo "And now?"
-			exit 0
+			git-branch -m $temp_branch bumped/$branch
 		else
 			echo "Merging back failed, please merge manually: $temp_branch" 1>&2
 		fi
@@ -121,6 +122,5 @@
 done
 
 # Local Variables:
-# mode:shell-script
 # sh-basic-offset:8
 # End: