[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-25 23:29:20 CEST

On Fri, 22 Sep 2006, Kamesh Jayachandran wrote:

> Daniel Rall wrote:
> >On Thu, 21 Sep 2006, Kamesh Jayachandran wrote:
> >
> >>>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
> >>>time!
> >>>
> >>Should we change our 'svn:mergeinfo' format a bit take care of '3 way
> >>merges'?
> >>Like 'pathname:revlist'|pathname1@rev1-pathname2@rev2'?
> >>
> >
> >I don't understand this.
> Like every other merge just record the 'svn:mergeinfo' with the value of
> the form 'path1@rev1-path2@rev2' for 3 way merges so that future such
> merges might start from rev1+ and rev2+ for those corresponding paths.
> This would be consistent with our way of maintaining the mergeinfo.(Of
> course it needs a tweak to 'sqlite database schema'.)

DannyB nixed this as unnecessary.

  • application/pgp-signature attachment: stored
Received on Mon Sep 25 23:30:49 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.