[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: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2002-02-08 16:06:50 CET

On Fri, Feb 08, 2002 at 08:59:55AM -0600, cmpilato@collab.net wrote:
> That's correct. I means that conflict resolution is this simple:
> edit out the conflict markers in working_file.00000.12345.rej
> rm working_file
> mv working_file.00000.12345.rej working_file
> So it gives the same beautifully easy CVS conflict resolution
> mechanism plus protection against checking in bogosity (without at
> least some human intervention).

+1 on this. i think it gives us the best compromise between safety
and actually making it possible to resolve confilicts.

> > Philip, who *likes* the current behaviour.
> To each his (or her) own, of course. If I can ask without trying to
> sound like I'm stirring an argument: how often do you have to resolve
> conflicts in Subversion trees? I only know how often *I* have to do
> so, and how painful it is.

i've only had to do it like twice, and both times it was so painful i
just chucked the changes and rewrote them. i sort of assumed there
was some magical easy way to do this that i was missing, but i guess
there currently isn't.


garrett rooney                     Unix was not designed to stop you from 
rooneg@electricjellyfish.net       doing stupid things, because that would  
http://electricjellyfish.net/      stop you from doing clever things.
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.