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

Re: merge should copy-with-history

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-08-07 22:35:44 CEST

Branko Čibej <brane@xbc.nu> writes:

> Bill Tutt wrote:
> >I don't suppose I can convince folks to alter the WC merge code to
> >record merge source information in the WC somehow?
> >
> That's on the stack, but it's not easy to do for (non-empty)
> directories. We want to get the "svn merge" semantics right ASAP; in
> time for 0.14.1, and fiddle with the WC functions later.

Yeah, Bill... now you're talking about essentially taking the first
design step in solving the repeated-merge problem. That's a BIG can
of worms to open right now. :-)

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 7 22:37:56 2002

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.