Someday we'll have merge tracking [was Re: svn commit: r17771 - branches/bdb-fixes/tools/dev]

On 19 Dec 2005 11:03:02 -0600, kfogel@collab.net <kfogel@collab.net> wrote:
> Any objection if changes like this start life on trunk?
>
> It's not a big deal. If it would slow you down then I'd say it's not
> worth it. But if it's the same either way, then non-branch-specific
> change like this should go to trunk first. (Someday we'll have merge
> tracking and it'll matter! :-) ).
>
> -Karl

I'd hope that when the day comes on which svn finally has merge
tracking it wouldn't matter where a change started out. You should be
able to merge in either direction.

Currently with svk merge tracking it's actually better to make changes
to the release branch first and then merge them to the trunk rather
than vice versa. (Since the latter would pull all trunk changes into
the release branch). In order to grab just particular changes from
trunk into a release branch you'd need cherry picking support in
addition to merge tracking.

Michael
Received on Sun Dec 25 02:50:42 2005