[Rivet] Fwd: [Rivet-svn] rivet: added missing metadata (mainly inspire IDs) to anainfos

David Grellscheid david.grellscheid at durham.ac.uk
Wed Sep 9 10:15:21 BST 2015


Hi all,

Catching up on old mail, sorry!

> I have a feeling that hg doesn't allow merging of isolated changesets 
> between branches, 

That's right. It's important to check in the fix to the right branch in
the first place. The hierarchy should be (release branch -> trunk ->
feature development branch). It always must be possible to do a full
merge in the direction of the arrows, but merging against the arrow
direction should be avoided!

See you,

  David


More information about the Rivet mailing list