[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: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2006-09-21 14:56:38 CEST

> 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'?

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 21 14:56:17 2006

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