On Nov 1, 2012, at 15:23, Blair Zajac wrote:

> If I have no other work to commit in my tree, I'll just do 'svn commit' 
> instead of listing the paths to commit.  In general, listing individual paths 
> isn't a great idea, since it's a practice that can mess up merging, where the 
> svn:mergeinfo property is changed on the root directory of a trunk or branch.

I always list paths when committing multiple ports, since I always have other 
uncommitted work.

I've sort of given up on Subversion merging for the MacPorts ports tree. I 
understood how merging worked in Subversion 1.4 and earlier, but when merge 
tracking was added in 1.5 it became confusing for me.

Merging (or just "svn copy"ing) used to be the only way to ensure that a file 
was only stored in the repository once, but now that Subversion has 
representation sharing, the space savings are automatic.

We should still use merging for MacPorts base, of course, when we want to 
backport a change from trunk to the release branch.


_______________________________________________
macports-dev mailing list
[email protected]
http://lists.macosforge.org/mailman/listinfo/macports-dev

Reply via email to