[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: Vladimir Prus <ghost_at_cs.msu.su>
Date: 2002-02-08 10:52:34 CET

Ben Collins-Sussman wrote:

> > Please don't do that. We don't want to leave conflict markers in files
> > because someone always screws up conflict resolution and you
> > end up with a bunch of <<<<<< characters in your files.
> > I am not joking, this happens all the time. Only those changes
> > that apply cleanly should be applied. This is a CVS mistake that
> > we should not make.
> I have to admit, I'm against inline conflict markers as well (-1 on
> the suggestion.) Something feels horribly wrong about conflicts
> dumping 'junk' into my working file.
> But Karl -- I know you prefer working with the inline markers. Maybe
> we could have create some process (another program? a new svn
> subcommand?) that takes a .rej file and *applies* it to your working
> file as inline markers?

That would be very handy. So far, I have no idea what to do with .rej file --
I simply know no way to generate <<<< markers from it, so that I can easily
resolve conflicts. Something like "svn resolve" can will be usefull.

But, maybe, new command is not needed at all: it's is possible, in case of
any conflict, to leave working copy file intact and store results of merge
with <<<< markers in .rej file. I'd personally prefer such behaviour.

- Volodya

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.