osimons wrote: > Both "svnmerge.py merge -r 8214" and "svn merge -c 8214 <0.11-stable- > url>" seems to give me more than I asked for, including modifying > svn:mergeinfo property not related to files I've touched > (Makefile.cfg.sample). Doing "svn revert Makefile.cfg.sample" cleans > the property again, making the commit-to-be look as I expect (as in: > as it used to look).
Christian and I talked about it earlier today, and there seems to be something weird about this particular file, somehow introduced in [8206]. It may be a bug in Subversion, or a leftover from a bad merge. > However, the fact that we now seem to use both merge tools just makes > me confused. Have any working practice changed? What am I expected to > do when merging - and using what tool? AFAIK, we're still using svnmerge.py for merging between 0.11-stable and trunk. Christian has been using "svn merge" for merging from rework-testing and to multirepos, and this has created the svn:mergeinfo properties. However, I don't think he's actually using that property, but keeping track by hand. So I'd suggest continuing to use svnmerge.py as usual, with the revert on Makefile.cfg.sample. -- Remy
signature.asc
Description: OpenPGP digital signature
