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

Re: [PATCH][merge-tracking]Fix for merge-tests 24 failure

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-09-21 02:55:21 CEST

On Wed, 20 Sep 2006, Kamesh Jayachandran wrote:
> Comparing 'range->start' and 'range->end' on two different URLs is
> meaningless.
> * subversion/libsvn_client/diff.c
> (grok_range_info_from_opt_revisions):
> Accepts URL1 and URL2 to make a meaningful comparison of
> range->start and range->end.
> (do_merge): Calls new 'grok_range_info_from_opt_revisions'.
> (do_single_file_merge): Calls new 'grok_range_info_from_opt_revisions'.

Kamesh, thanks for the test fix -- I've committed to the branch as
r21577 with some tweaks. While correct handling of merge info for the
3-way merge really doesn't work yet, this is an incremental step in
the right direction (documented in the TODO file). It's great than
you were able to make forward progress and fix a test at the same

  • application/pgp-signature attachment: stored
Received on Thu Sep 21 02:56:37 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.