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

Re: [Show] Re: [PATCH] #2403: Incorrect merge of binary file when already existing

From: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2006-05-12 22:34:58 CEST

Daniel Rall writes:
> On Fri, 12 May 2006, Peter N. Lundblad wrote:
>
> > Daniel Rall writes:
> > > * subversion/libsvn_client/diff.c
> > > (struct merge_cmd_baton): Add new add_necessitated_merge flag
> > > indicating that invocation of the merge_file_added callback
> > > required delegation to the merge_file_changed callback. This is
> > > important for detecting whether the left side of a 3-way merge
> > > actually exists, or is only present for implementation purposes.
> >
> > This long description belongs in the code, not the log message.
>
> Yeah, it does. What you see there is a combination of the end of the
> day and me wanting to get out of the office. :-P
>
> I'll clean this patch up before committing, commit the whitespace
> change separately. Thanks to everyone for the review.

:-)

On another note, this needs a test case as well. That simplifies backporting
if that's desired.

> > > Index: subversion/libsvn_client/diff.c
> > > ===================================================================
> > > --- subversion/libsvn_client/diff.c (revision 19623)
> > > +++ subversion/libsvn_client/diff.c (working copy)
> > > @@ -1002,6 +1016,8 @@
> > > }
> > > else
> > > {
> > > + /* Indicate that we're merging as the result of an add. */
> > > + merge_b->add_necessitated_merge = TRUE;
> > > SVN_ERR(merge_file_changed(adm_access, content_state, prop_state,
> > > mine, older, yours,
> > > rev1, rev2,
> >
> > Doesn't the flag need to be reset to FALSE afterwards?
>
> I don't think so -- as I understand things, the merge_cmd_baton struct
> has a lifetime of a single merge operation, and the fact that
> invocation of the merge_file_added() callback subsequently needed to
> invoke the merge_file_changed() function doesn't change during the
> lifetime of that merge operation.

What do you mean by "a single merge operation"?

//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 12 22:35:24 2006

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