On 17.07.2009, at 19:40, Jeff Griffiths wrote:
On 17/07/09 8:31 AM, Davey Shafik wrote:
...
More importantly, the branch/merge support in SVN is limited to
temporary feature/bug branches. You branch, *complete* the feature/
bug
fix, and then merge it in. After that, if you decide to carry on in
your
branch, SVN's merge tracking cannot handle the tracking of changes.
You
need to merge, delete, re-branch, carry on. This doesn't work for
say,
the 5.3.x branch fixes getting pushed into trunk, the 5.3.x branch is
toast as far as SVN is concerned once you merge the first fix — quite
useless.
Is it that limited? I hadn't used it ( for a variety of reasons the
server is stuck on SVN 1.4 or something ). We DO use the svnmerge
tool for maintaining dev / stage / production branches for web apps
and versioned branches of things like Komodo. I guess I had assumed
form shire's reply that the svn 1.5.x merge support was a work-
alike, but I haven't ever attempted to use it myself.
there is a fat warning fo this in the manual. i dont quite get why .
but that is the case atm.
also using merge tracking is only fun if everybody does it .. because
if only some people use it .. they first have to figure out which
things have not been merged via svn merge, as svn merge updates its
metadata. when merging you can either mark an entire range of
versisions as merged .. or just individually.
regards,
Lukas Kahwe Smith
m...@pooteeweet.org
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
