[Xen-changelog] [IA64] Add -rc support to sparse-merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 0dabd651b856a9d7213f4c05a6749553d0580f78
# Parent  953753661a3bf13d079823fc422b4c93c5a1c240
[IA64] Add -rc support to sparse-merge

Signed-off-by: Aron Griffis <aron@xxxxxx>
---
 xen/arch/ia64/tools/sparse-merge |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

diff -r 953753661a3b -r 0dabd651b856 xen/arch/ia64/tools/sparse-merge
--- a/xen/arch/ia64/tools/sparse-merge  Tue May 23 15:09:21 2006 -0600
+++ b/xen/arch/ia64/tools/sparse-merge  Tue May 23 15:10:27 2006 -0600
@@ -33,9 +33,17 @@ cd $LINUXPATH || exit 1
 cd $LINUXPATH || exit 1
 OLDCSET=$(hg parents | awk '/^changeset:/{print($2)}' | cut -f 1 -d :)
 for t in $OLDTAG $NEWTAG; do
+    [[ $t == *.* ]] || continue
     if ! hg tags | cut -f1 -d' ' | grep -Fx $t; then
        echo "Tag $t not found, ketching up"
-       hg up -C ${t%.*} || exit 1
+       if [[ $t == *-* ]]; then
+           # rc/pre/git versions start at the previous stable release
+           micro=${t%%-*}; micro=${micro##*.}
+           stable=${t%%-*}; stable=${stable%.*}.$((micro-1))
+           hg up -C $stable
+       else
+           hg up -C ${t%.*} || exit 1
+       fi
        ketchup ${t#v} || exit 1
        hg addremove
        hg ci -m $t

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog