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

Re: svn commit: r33483 - in branches/1.5.x: . subversion/bindings/swig tools/po

From: Peter Samuelson <peter_at_p12n.org>
Date: Mon, 6 Oct 2008 18:53:31 -0500

[Greg Stein]
> Why are the properties on CHANGES, COMMITTERS, and bindings/swig
> always changing in these merges? Is there anything that can be done
> about these (spurious?) notifications?

That's svn:mergeinfo. Since merge tracking is at file granularity, if
you ever do a merge operation on anything other than the root of a
branch, the file or directory in question gets its own copy of
svn:mergeinfo, which then must be kept up to date until the end of
time.

If you don't want the clutter and overhead, you have to make a habit of
merging only from/to the root of a branch. And remember to 'svn
propdel svn:mergeinfo filename' after every 'svn cp' or 'svn mv'.

-- 
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-07 01:53:47 CEST

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