: I find it onerous that one need do a merge for this kind of thing : period. Why not just apply the patch a second time? Sure, something is : lost in SVN, but it's covered elsewhere. Of course, the flip side is : that by not doing it, it becomes all that much harder to merge in the : future.
Exactly -- the amount of work required to apply a one line patch to two distinct branches is about the same as the amount of work to apply that patch to trunk and then svn merge it to the branch -- but the impact on other people who have much more complicated merges is huge. when you use svn merge, you make all of those future (big) merges much simpler to deal with -- but every time you apply a patch directly to both branches and commit individually, you introduce a conflict that has to be resolved manually by every person who ever tries an svn merge on that file in the future. -Hoss --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
