[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Shouldn't --reintegrate used with a 2-URL merge perform checks?

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 29 Jun 2010 10:36:59 -0400

On 06/29/2010 10:26 AM, Brandt, Servatius (External) wrote:
> This is an suggestion to improve the --reintegrate option to perform
> similar checks on a 2-URL merge as it already does when used with
> a 1-URL merge.

Ahem. I think we lack this patch:

Index: subversion/svn/merge-cmd.c
===================================================================
--- subversion/svn/merge-cmd.c (revision 958677)
+++ subversion/svn/merge-cmd.c (working copy)
@@ -334,6 +334,11 @@
     }
   else
     {
+ if (opt_state->reintegrate)
+ return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
+ _("Cannot specify --reintegrate "
+ "with two URLs"));
+
       err = svn_client_merge3(sourcepath1,
                               &first_range_start,
                               sourcepath2,

I don't believe we support --reintegrate on a two-URL merge. Unfortunately,
the client doesn't tell you that -- it just silently falls into a
non-reintegrate merge codepath.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
Received on 2010-06-29 16:38:03 CEST

This is an archived mail posted to the Subversion Dev mailing list.