[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: Mo DeJong <supermo_at_bayarea.net>
Date: 2002-02-08 07:42:43 CET

On Fri, 8 Feb 2002 01:14:05 -0500 (EST)
Daniel Berlin <dan@dberlin.org> wrote:

> > Please don't do that. We don't want to leave conflict markers in files
> > because someone always screws up conflict resolution


> I have a hard time believing this.
> So i grepped gcc's cvs repo, and it appears to have only ever happened
> once outside of the changelogs (where it happens every 200 revisions or
> so).

I seem to remember running into conflict markers in files multiple times
when working in devo. Also, files that get compiled would tend to generate
syntax errors so this will come up less in C code that it does general files.
The fact that merge conflicts show up in the ChangeLog should be a
blinking red warning sign with a loud horn.

I was under the impression that one of subversion's design goals was
to avoid mucking up the users files. Sure everyone could be more careful,
but the tool could help by not getting users into error prone situations
in the first place.


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.