osimons <[email protected]> writes: > I do wonder if "svn propdel svn:mergeinfo Makefile.cfg.sample" would > do us good... See any problems with that?
I am using svn 1.5.5 and 1.5.6 with merge tracking. My rule is that merges may only be done at module roots. This results in no mergeinfo other than at top level. You may have stray mergeinfo because svn copy used to create it (but no longer does). Once subtree mergeinfo exists then any merge will update it, because the node with subtree mergeinfo no longer inherits from the parent's mergeinfo.
pgpyDT7KHRjP3.pgp
Description: PGP signature
