On 6/13/2013 9:56 AM, Michael McCandless wrote:
On Thu, Jun 13, 2013 at 11:07 AM, Yonik Seeley <[email protected]> wrote:
IMO, patches should normally be aimed at trunk and backported.
"svn merge" tends to make a mess of the target (mergeproperties
updated so you can't tell at a glance what files a patch actually
changed), and in general we've tried to keep trunk clean by merging
from trunk instead of to trunk.
Is this really true anymore, with latest svn clients (1.7.x)?
I had always assumed devs are free to merge in either direction ...
whatever their preference is.
I've noticed that subversion 1.7 gets rid of the problem where tons of
completely unrelated files get property updates, but the commit after a
merge does still (correctly) touch more than the patched files.
It's cleaner to target trunk and then backport, but as Uwe just said,
there are sometimes legitimate reasons for going the other direction.
Thanks,
Shawn
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
