Hi!
On 8/8/11 9:34 AM, Johannes Schlüter wrote:
* It is said that the preferred way to get a patch from one branch
to another is by doing a merge operation in the VCS. Depending
on the timing we will most likely end up with two (trunk + 5.4)
or, more likely, three (+ 5.3) old branches which are active.
Will it be possible to merge between them using the VCS's merge
facilities or will we end up cherry-picking there? If this is
Depending on the direction of merges, it may work as merge (if you want
all changes, i.e. merging up) or as cherry-pick (if you want to merge
down). Or you may make a branch from your changes and merge it where you
like.
What's good with cherry-picking, you can still have full commits so you
know who did it and why and can relate to the original source.
possible and we continuously merge these branches what are the
strategies for preventing specific changes from being merged
with the suggested systems (git and hg)?
I'd suggest putting changes always in the lowest (oldest) branch first
and then merge the branches up to newest. This way we ensure the changes
are always in sync. But there can be challenges if there is substantial
code change between branches, of course, so sometimes we'd have to
cherry-pick or even do something more interactive, git merge is good but
not *that* good :)
--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
