[Rivet] HG transition

[Frank Siegert]

Hi David,

>> Ah, that's how all the other commits in hg log got a meaningful commit
>> message instead of just "merge"?
>
> No. Have a look at the graphical log on trac/log, maybe that makes it
> clearer.

Ok, so because I forgot to update before implementing my changes I
basically branched and merged, which makes it look more complicated
than it actually was. The other commits were simply done quick enough
or used rebase.

>> So we should definitely include
>> rebase in the workflow description for simple "direct" commits to
>> trunk, right?
>
> I'd prefer not to for now, it's only useful for really simple local commit
> trees that commute easily with what was just pulled in. It's complicated
> enough as it is for beginners.

But just for my understanding: There is no better solution if
(unrelated) changes come in while I implement small changes myself,
right? I'm basically looking for anything similar to an "svn update"
which doesn't involve a new commit, such that the commit log remains
"readable"?

I guess one could just be quick enough with committing to avoid
crossing each other, but then this somewhat contradicts the usage of a
VCS. ;-)
So the choice is between messy commit logs or non-default features (rebase)?

>> I'm a bit surprised that I don't see my intermediate commits in the
>> log after pushing,
>
> You pushed two changesets, your commit eb4c2 and the merge 08fb55. Were you
> expecting others?

That's the other thing which confused me: The history in my local repo
looks different! Even after pull and update, my local history has my
actual commit (eb4c2, which is r4014 in the central repo) at r3958,
which is why I didn't see it at first. I understand that these
discrepancies are temporarily present in a distributed VCS, but I
always thought that after pushing, pulling and updating everything
will be identical. Seems like not.

Anyway, I'm slowly starting to feel like I can use it now. Thanks for
the hints and sorry for making the commit log look more complicated
than necessary!

Frank