From fa7a9c9198b4571ad06735cf58d202ddc72ea5ef Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 2 Dec 2008 21:58:06 +0100 Subject: [PATCH] --- yaml --- r: 122983 b: refs/heads/master c: ff80aa97c9b4aae9449a608fe1bc3e7b5121cd66 h: refs/heads/master i: 122981: 8bde5bf5789e4e7801a5c970007516a95c37109c 122979: a34e18945852362e167dabf93a61ea34c4ddb702 122975: 37473c2b9cf67a7453d173ff7da765efe9a0de5e v: v3 --- [refs] | 2 +- trunk/scripts/setlocalversion | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f29c4d556f6e..6d913d9698d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 167d6a02c1dbdd84d49e87df7718f18fa31cb971 +refs/heads/master: ff80aa97c9b4aae9449a608fe1bc3e7b5121cd66 diff --git a/trunk/scripts/setlocalversion b/trunk/scripts/setlocalversion index 81d984b91594..f6946cf99ce1 100755 --- a/trunk/scripts/setlocalversion +++ b/trunk/scripts/setlocalversion @@ -19,6 +19,11 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then fi fi + # Is this git on svn? + if git config --get svn-remote.svn.url >/dev/null; then + printf -- '-svn%s' "`git-svn find-rev $head`" + fi + # Are there uncommitted changes? git update-index --refresh --unmerged > /dev/null if git diff-index --name-only HEAD | grep -v "^scripts/package" \