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

Re: Merge Tracking Metadata Interface

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-07-08 08:37:20 CEST

On Fri, 07 Jul 2006, Garrett Rooney wrote:

> On 7/7/06, Madan U Sreenivasan <madan@collab.net> wrote:
>
> >Manual merges need to be hand-edited... (or maybe we should provide an
> >equivalent of the --record-only option in svnmerge!)
>
> That's what I'm saying, I think it's insane to expect people to hand
> edit it. We will have to provide some sort of command to manage it.

The plan has been to provide the equivalent of 'merge --record-only'
(along with most of the svnmerge.py-like higher level operations) for
as long as there as been a plan. :-P

  • application/pgp-signature attachment: stored
Received on Sat Jul 8 08:38:37 2006

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