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

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

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-05-12 04:56:06 CEST

On 5/11/06, Daniel Rall <dlr@collab.net> wrote:
> Well, this wasn't exactly what I had in mind after talking with Ben,
> but given the way the code is structued for creation of an empty file
> (for a file which doesn't exist in the repository) to be used as the
> 'left' side of the merge (libsvn_client/repos_diff.c:add_file() calls
> get_empty_file()), recording some context in the baton seemed like a
> simpler way to go.

Seems reasonable to me.

> merge_outcome = svn_wc_merge_merged;
> merge_required = FALSE;
> }
> - }
> + }

Extraneous whitespace modification ;-)

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 12 04:56:31 2006

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