Hi all, It's been a while since my last commit, and in the meantime something seems to have changed. I noticed we're now on Subversion 1.5 (good thing), but I'm mighty confused about merging my revision 8214 to trunk from 0.11-stable.
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). 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? :::simon https://www.coderesort.com --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Trac Development" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/trac-dev?hl=en -~----------~----~----~----~------~----~------~--~---
