[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: Daniel Rall <dlr_at_collab.net>
Date: 2006-05-13 01:01:25 CEST

On Fri, 12 May 2006, Peter N. Lundblad wrote:

> 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.

Yeah, I'm working on it (that's why I haven't committed yet). I do
intend to propose this change to backport to 1.4.x. And if I get it
done fast enough, probably 1.3.x also.

-- 
Daniel Rall

  • application/pgp-signature attachment: stored
Received on Sat May 13 01:02:04 2006

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