Rich Williams <>

r865997, r861600

r861600 | rooneg | 2006-09-18 15:23:38 +0000 (Mon, 18 Sep 2006)

Pass a path to ne_lock_discover, not a URL, since it's supposed to take
a path, and it seems like it's only an accident that a URL works. This
fixes an issue where access to a repository is proxied via a RewriteRule.

Patch by: Rich Williams <>
Tweaked by: me

* subversion/libsvn_ra_dav/session.c
  (svn_ra_dav__get_lock): Only send the path portion of the URL in to

r865997 | dustin | 2007-08-01 20:41:12 +0000 (Wed, 01 Aug 2007)

* contrib/client-side/svnmerge/
  (initialized_revs): New function
  (analyze_revs, action_avail, action_merge, action_block): Exclude
    initialized revisions when considering candidates, if
    --bidirectional is specified
* contrib/client-side/svnmerge/
  (testBidirectionalMergesMultiBranch): test initialized revision detection
Patch by:  Rich Williams <>
Patch by:  Michael Willmott <>
Review by: Giovanni Bajo <>