On Sat, Jul 07, 2012 at 06:17:12PM +0200, m0n0 wrote:
This will ease the "maintainers" of the
tree to track new commits. Otherwise the diffs will get
larger and larger...
If there is really now way to integrate the branch "soon",
then it looks like we have (the need for) an fork,
and I don't know if I want to care about such fork,
because it means to pull in master commits into the fork within time.
Criss-Cross merging in git is cheap and easy and I'd suggest you try it. If I
were the spidermonkey-1.7 branch maintainer I would be regularly merging master
into my branch (or rebasing my branch on top of new master) so that I could
test against changes made in master and ensure that my patches apply cleanly.
Otherwise when it comes to merging to master, the maintainer of that section
(Vincent) will find it hard to merge the code and thus will be less likely to
It is the job of the branch owner to make sure their branch is mergeable with
master if they actively expect it to be merged.
Daniel Silverstone http://www.netsurf-browser.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69