[Rivet] HG transition (was: Proposal for multi-weight/NLO counter-event support...)

[Frank Siegert]

Hi David,

Thanks for the clarifications, I still have a few questions (looking
forward to the Wiki page, since it might answer some of them):

> Yes, I'm putting together a Wiki page with the details right now. As a
> quick start, the trunks are
>
> hg clone ssh://login.hepforge.org//hepforge/hg/yoda/public/yoda
> hg clone ssh://login.hepforge.org//hepforge/hg/rivet/public/rivet
>
> New features should _not_ get added there, instead development happens

I'm confused now. I thought if I want to add a new analysis I would
simply clone that "trunk", implement my changes locally (potentially
with intermediate local commits) and when I'm finished pull and merge
any updates and then push my stuff back. Is that not correct?
Or are you referring only to larger development where multiple people
are involved (in which case also in SVN one would have been using a
branch)?

Maybe just for clarification if I misunderstood the workflow, or as a
basis for the wiki page:

(0. Clone the repo -- just once at the beginning)
$ hg clone ssh://login.hepforge.org//hepforge/hg/rivet/public/rivet
$ cd rivet

1. Implement one new feature
$ hg pull
$ hg update
$   # develop first part of change
$ hg commit -m "first part of my change"
$   # develop second part of change
$ hg commit -m "second part of my change"

2. Get updates from central repo
$ hg pull
$ hg merge
$ hg commit -m "merge"

3. Push to central repo
$ hg push

... Repeat 1-3 for the next features ...

Is that correct so far?

> on individual branches in
>
> hg clone ssh://login.hepforge.org//hepforge/hg/yoda/private/...
> hg clone ssh://login.hepforge.org//hepforge/hg/rivet/private/...

How does one create such a private branch (or is it called
repository)? And how are they merged back into the mainline?

Cheers,
Frank