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

Re: A modest proposal: No index or "log -g" in Subversion 1.5

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-12-01 04:20:15 CET

On Nov 30, 2007 4:23 PM, Blair Zajac <blair@orcaware.com> wrote:

> It just works. I mean, you still can get conflicts when you merge back and you
> resolve those just as you normally would.
>
> Thinking about it, I guess you might have to redo conflict resolution again when
> you merge changes back to trunk.

Yeah, I wouldn't categorize that as 'just works'. Why should a user
have to resolve the same conflicts twice? That's an indication that
there are some changes *not* being tracked that should be.

Then again, if a whole set of users is already used to svnmerge.py
doing this, and think it's acceptable, maybe it's not the end of the
world for svn 1.5 to match the behavior. It feels like a great
lowering of standards, though.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Dec 1 04:20:25 2007

This is an archived mail posted to the Subversion Dev mailing list.