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

Re: Patch command execution

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-02-08 17:29:33 CET

Philip Martin <philip@codematters.co.uk> writes:
> All three versions of the conflicting line are available. I think
> your proposal means that only two of those are visible. Yes, the
> third is available from the repository, but getting it is a little
> tricky. I need to know the revision of the file I was using before I
> ran 'svn up' and that requires recording it *before* invoking the
> command - once I see the conflict it is too late. [One change I would
> like to see to conflict reporting is to put the revision numbers into
> the rej-file. Conflict resolution, like version control, is all about
> history.]

Just a note, yes: systems that store conflict markers should make sure
to store a pristine version of the working file somewhere. CVS does
this, if we use conflict markers, we should too. We'd also have the
pristine repository version locally, which is a nice bonus.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006

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.