FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 03-19-2010, 09:45 AM
Stefan Bader
 
Default UBUNTU: (buildenv) Make rebase-branch script a bit more intelligent

Don't allow tag names that do not exist and give a few more specific pointers
on how to proceed.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
debian/scripts/misc/rebase-branch | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/debian/scripts/misc/rebase-branch b/debian/scripts/misc/rebase-branch
index 8e4e388..ea988aa 100755
--- a/debian/scripts/misc/rebase-branch
+++ b/debian/scripts/misc/rebase-branch
@@ -18,7 +18,26 @@
# 5. Keep things in a state that they can be merged back
# into the main tree at the end of the dev cycle

-remoteTag=${1:?"Usage: $0 <remote-tag to rebase on>"}
+CurBase=$(git log --pretty=oneline --grep="UBUNTU: Ubuntu-2.6.24" -1 |
+ cut -d' ' -f3-)
+CurBranch=$(git branch|awk '/^*/{print $2}')
+
+if [ "$1" = "" ]; then
+ echo "Usage: $(basename $0) <tag in master branch to rebase on>"
+
+ NewBase=$(git log --pretty=oneline --grep="UBUNTU: Ubuntu-2.6.24"
+ -1 master|cut -d' ' -f3-)
+ echo
+ echo "Last base seems to be $CurBase"
+ echo "The latest master release is $NewBase"
+ exit 1
+else
+ remoteTag="$1"
+fi
+if [ "$(git tag -l $remoteTag 2>/dev/null)" = "" ]; then
+ echo "ERROR: $remoteTag does not seem to be a valid tag!" >&2
+ exit 1
+fi

rebasing=".git/rebase-apply"

@@ -161,7 +180,20 @@ fi
echo ""
echo "If the final result looks good, then do the following to make it permanent:"
##echo " * Run debian/scripts/misc/retag-branch to retag"
-echo " * git checkout <original branch>"
+echo " * git checkout $CurBranch"
echo " * git reset --hard $remoteBranch"
+echo
+echo "Some hints to progress (ONLY HINTS! DON'T TRUST ULTIMATELY!)"
+echo " * Start a new release (if you did not before)"
+echo " * ./debian/scripts/misc/insert-ubuntu-changes debian/changelog "
+ $(echo $CurBase|cut -d- -f3) $(echo $remoteTag|cut -d- -f3)
+echo " * git add debian/changelog"
+echo " * git commit -s -m "UBUNTU: Rebased to $(echo $remoteTag|cut -d- -f2-)""
+echo " * Add any other changes you want to have in that release"
+echo " * Insert the changes into the changelog and commit that"
+echo " * Note: Make sure the commit tag is UBUNTU: NBK-Ubuntu-2.6.24-..."
+
+exit 0
+
echo " * rm -rf patches/"

--
1.6.3.3


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 

Thread Tools




All times are GMT. The time now is 03:20 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org