Skip to content

Commit

Permalink
generate-svn-snapshot: avoid mergeWithUpstream failure with recent su…
Browse files Browse the repository at this point in the history
…bversion versions

With subversion >=1.9 it fails hard if mergeWithUpstream property isn't present:

  ++ svn propget mergeWithUpstream source//debian
  svn: warning: W200017: Property 'mergeWithUpstream' not found on 'source/debian'
  svn: E200000: A problem occurred; see other errors for details

Closes #164
  • Loading branch information
Michael Prokop committed Oct 14, 2016
1 parent 94ea633 commit 9221f9c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion scripts/generate-svn-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@ esac

cd $ORIG_DIR

debian_only="$(svn propget mergeWithUpstream source/${branch:-}/debian)"
# subversion >=1.9 fails hard, see github issue #164
debian_only="$(svn propget mergeWithUpstream source/${branch:-}/debian || true)"

if [ -n "${SBP_OPTS:-}" ] ; then
echo "*** Found environment variable SBP_OPTS, set to ${SBP_OPTS} ***"
Expand Down

0 comments on commit 9221f9c

Please sign in to comment.