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

Re: mergeinfo properties getting carried around, makes for confusing merges

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 10 Nov 2009 14:10:06 +0100

On Tue, Nov 10, 2009 at 01:57:27PM +0100, Stein Somers wrote:
> Stefan Sperling wrote:
> > If the mergeinfo is not redundant, it is there for a reason.
> > Either a bug in Subversion (if you were using early 1.5.x versions),
> > or because of the way certain merges were done (more likely unless
> > all your users are among the few who understand Subversion's merge
> > tracking feature extremely well [...]
>
> We can drop the "unless": if all his/her users were like that, I'm sure
> he/she would be too and this thread would not have started. So you're
> saying to those annoyed by changing mergeinfo on files, that it's more
> likely the mergeinfo is important.

Yes.

> I contest that. As far as I know, the only way to kick off genuine
> mergeinfo on a file is by merging that particular file. I think few
> users realize you can "officially" merge a subdirectory or a particular
> file, let alone do it to many files.

A lot of users use GUIs, and GUIs make it very easy to make these
kinds of mistakes. People right-click on files and merge into them,
commit them, etc.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2416137

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-10 14:11:10 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.