|
[Rivet] Branched release-2-0Frank Siegert frank.siegert at cern.chFri Oct 25 21:39:04 BST 2013
>>> The 'default' branch is now free again to merge in any completed >>> development >>> features which will belong in 2-1. Progress on release-2-0 should also be >>> pulled into 'default' from time to time. >> >> Is it not typically going to be the other way around: New features go >> into default and are then selectively pulled into release-2-0? > > New features go into default, yes. But they will _never_ appear under a > 2.0.x number, so no reason to pull that way. Sorry, my bad, I meant "new features, bugfixes and new analyses/projections". > Also, hg pull cannot selectively pick individual changesets. You always get > the full tree leading up to that point. That would mean that pulling default > into release-2-0 brings _all_ of default in. That's not the behaviour you > usually want. Aaah, that explains it! Then of course it's clear that new analyses and bugfixes have to go into the release branch. I thought it works similarly to how I used SVN: put the new feature into trunk and then merge it into a branch if wanted. Is such a workflow completely impossible/disfavoured in hg? Cheers, Frank
More information about the Rivet mailing list |