RE: merge should copy-with-history

Just your friendly neighborhood ant hill poker taking another jab. ;)

Bill

----
Do you want a dangerous fugitive staying in your flat?
No.
Well, don't upset him and he'll be a nice fugitive staying in your flat.
 
> -----Original Message-----
> From: sussman@collab.net [mailto:sussman@collab.net]
> Sent: Wednesday, August 07, 2002 1:36 PM
> To: Branko Cibej
> Cc: Bill Tutt; Philip Martin; dev@subversion.tigris.org
> Subject: Re: merge should copy-with-history
> 
> 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