On Mon, 28 Jul 2003, Sander Striker wrote:
> > From: kfogel@newton.ch.collab.net [mailto:kfogel@newton.ch.collab.net]On
> > Behalf Of kfogel@collab.net
> > Sent: Monday, July 28, 2003 6:38 PM
>
> > Ben Collins-Sussman <sussman@collab.net> writes:
> > > Yeah, that's the core problem with this bug. The main question is:
> > > "how did this file get into a schedule-add-with-history state?"
> > >
> > > When that code was written (possibly by me, long ago??) the author was
> > > *only* thinking about the 'svn cp wc wc' case. In that scenario, the
> > > text-base *does* exist, I believe. But the other possibility is 'svn
> > > cp URL wc', where there's no text-base. Whoops. This is the command
> > > that 'svn merge' runs.
>
> Ben, we thought that out together a while back IIRC.
>
> > So if we fix that merge bug, then #1297 goes away?
>
> The svn copy 'bug' you mean? When doing a copy, there should be a textbase
> afterwards, agreed?
>
OK. Should it be an empty text-base or a text-base with the contents of
the file?
If it's empty then svn diff will work correctly. I don't know why it
should be full.
Regards,
Shlomi Fish
> > Shlomi, want to make 'svn merge' create text bases for added files? :-)
>
> The merge code just uses the copy code. Fix that and these bugs will go
> away.
>
> Ofcourse, someone else might have a different approach in mind. I mean,
> there must be some reason for svn cp URL wc not to create a text-base?
>
>
> Sander
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
----------------------------------------------------------------------
Shlomi Fish shlomif@vipe.technion.ac.il
Home Page: http://t2.technion.ac.il/~shlomif/
An apple a day will keep a doctor away. Two apples a day will keep two
doctors away.
Falk Fish
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 28 22:31:47 2003