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

RE: Mergeinfo still not eliding in Subversion 1.6.5

From: Bob Archer <bob.archer_at_amsi.com>
Date: Tue, 29 Sep 2009 18:19:50 -0400

> Yes, those files/folders have mergeinfo before the merge. I guess I am failing to understand why this "by design" behavior is a >good thing. Any time somebody does a merge at the level of a directory containing no mergeinfo, they will get mergeinfo on that >directory. And thereafter, every merge at a higher level will update that mergeinfo.

Ok, I guess a developer will have to clairfy why this happens. But, my thought would be that the svn developer assume that if you are merging at a certain level then you expect to do that again.... hence the mergeinfo is place at that level. Also, if you checkout from ^/trunk/FolderA rather than ^/trunk and do a merge info ^/trunk/FolderA and there is no merge info on FolderA, it was only created on ^/trunk then you are going to possibly be re-merging the same revisions again.

I may be wrong in that the client reads the merge info from the repository walking up the folder tree, but I expect since the merge is done on the client it only has access to the mergeinfo in the working copy.

Perhaps Mark or Hyrum can confirm or deny my assumptions here.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-30 00:20:52 CEST

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.