Re: svn checkout suggestion
| From: | Jeff Griffiths | Date: | Fri, 17 Jul 2009 17:40:16 +0000 |
| Subject: | Re: svn checkout suggestion | ||
| References: | 1 2 3 4 5 6 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-45018@lists.php.net to get a copy of this message | ||
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. Jeff