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

RE: Resend: Issue #1297: `svn diff' after `svn merge' that adds a file fails

From: Sander Striker <striker_at_apache.org>
Date: 2003-07-28 21:35:07 CEST

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

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?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 28 21:35:56 2003

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.