[PATCH] Re: Thinko in libsvn_client/merge.c?

[Roderich Schupp <ro...@googlemail.com>]

On Thu, Apr 15, 2010 at 2:25 PM, C. Michael Pilato <cm...@collab.net> wrote:
> Roderich Schupp wrote:
>> On Tue, Apr 13, 2010 at 4:37 PM, C. Michael Pilato <cm...@collab.net> wrote:
> Cool.  I'll watch for your followup posts, and be glad to try to answer any
> questions you might have about the code.


OK, here's my patch for merge_reintegrate_locked.
Passes all regression tests (over local and HTTP transport).
So if we try to

svn merge --reintegrate SOME-URL ANOTHER-WC

where ANOTHER-WC is from a different repository than SOME-URL
if would previously fail with

svn: URL 'SOME-URL' is not a child of repository root URL 'ANOTHER-URL'

(where ANOTHER-URL is the URL of the repos root of ANOTHER-WC)
and now it fails with the much clearer

svn: 'SOME-URL' must be from the same repository as 'ANOTHER-WC'

However, that doesn't address the fact that this is probably another case
where a session is indiscriminantly opened at the repository root
(the root cause of issue 3242). So perhaps a "fixme" comment
should be added as well.

[[[
Fix check in "merge --reintegrate" whether merge source and
working copy target belong to the same repository.

* subversion/libsvn_client/merge.c
  (merge_reintegrate_locked) Correctly compute the repos root URL
   for the merge source.
]]]


Cheers, Roderich

Re: [PATCH] Re: Thinko in libsvn_client/merge.c?

["C. Michael Pilato" <cm...@collab.net>]

Roderich Schupp wrote:
> [[[
> Fix check in "merge --reintegrate" whether merge source and
> working copy target belong to the same repository.
> 
> * subversion/libsvn_client/merge.c
>   (merge_reintegrate_locked) Correctly compute the repos root URL
>    for the merge source.
> ]]]
> 
> 
> Cheers, Roderich

Looks great.  Committed (with the aforesuggested FIXME comment):

   Sending        trunk/subversion/libsvn_client/merge.c
   Transmitting file data .
   Committed revision 935631.

Will propose for backport to 1.6.x, too.

-- 
C. Michael Pilato <cm...@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand