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

Re: svn:ignore-on-commit changelist -- was: dump svn:hold, long live file externals?? (and discussing recursive hold)

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 24 Aug 2011 19:09:41 +0200

On Wed, Aug 24, 2011 at 12:05:00PM -0400, Mark Phippard wrote:
> There is nothing wrong with adding it and I believe I have said that. I
> have also said that I was in favor of solving the issue. All I am saying is
> that Neels has done some good work looking at what that feature means in its
> entirety and he has uncovered a number of things to consider. He happens to
> not think they are a big deal, which is fine. I am simply saying that one
> option we have is to not implement the feature until we have a better answer
> for those considerations.

OK, we're on the same page then.
I agree we need to agree on the points that are still unclear.

> Merge remains a problem. Namely that if merge updates files with the
> svn:hold property the changes to those files will not be committed.

I would say just let it be that way. It shouldn't matter whether
local mods come from merges or from manual edits.

If the changes being merged into a held file are important,
then there's a user error -- the file should probably not
have been held in the first place.
Received on 2011-08-24 19:10:34 CEST

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