[ooo-build-commit] bin/cws-extract
Jan Holesovsky
kendy at kemper.freedesktop.org
Sat Oct 31 14:23:39 PDT 2009
bin/cws-extract | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 44ffa7c70630dd188908c5b7ed2a525d968b22f3
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sat Oct 31 22:22:42 2009 +0100
Fix cws-extract to work correctly on rebased CWSes.
* bin/cws-extract: Check for rebases.
diff --git a/bin/cws-extract b/bin/cws-extract
index 41e4e0b..ec65008 100755
--- a/bin/cws-extract
+++ b/bin/cws-extract
@@ -27,16 +27,11 @@ done
[ -n "$CWS" ] || usage
-LOG=`mktemp /tmp/cws-extract.XXXXXX`
-
# log of the branch only
-svn log --stop-on-copy "svn+ssh://svn@svn.services.openoffice.org/ooo/cws/$CWS" > "$LOG"
-
-MERGE_BASE=`grep -A 1 '^--------------------------------------' "$LOG" | \
- grep '^r' | tail -n 1 | sed 's/^r\([0-9]*\)[^0-9].*/\1/'`
+MERGE_BASE=`svn log --stop-on-copy "svn+ssh://svn@svn.services.openoffice.org/ooo/cws/$CWS" | \
+ grep 'CWS-TOOLING: \(rebase\|create\) CWS' | head -n 1 | \
+ sed 's/^.*trunk@\([0-9]\+\).*$/\1/'`
if [ -n "$MERGE_BASE" ] ; then
svn diff -r "$MERGE_BASE" -x "$DIFFPARAMS" "svn+ssh://svn@svn.services.openoffice.org/ooo/cws/$CWS" > "cws-$CWS.diff"
fi
-
-rm "$LOG"
More information about the ooo-build-commit
mailing list