Re: [eigen] Re: converting to Hg

[ Thread Index | Date Index | More Archives ]

On Thu, May 7, 2009 at 3:02 AM, Benoit Jacob <jacob.benoit.1@xxxxxxxxx> wrote:
> Quick updates:
> 1) We'll wait until next week to do the actual move, as it's more
> convenient for Thomas. Actually, we also need some time to get
> acquainted with Hg.
> 2) Speaking of which, here's an issue i've been trying to figure out.
> Suppose i make a local change (call that commit a), and the same file
> was modified by someone else meanwhile (call that commit b), so before
> pushing my change to the repository I need to pull and merge (call
> that commit c). Fine. Now if I push this to the repository, I'm
> actually pushing not only my useful commit "a", but also the
> merge-commit "c". So the repository now looks like:
> c
> |\
> | \
> a b
> | /
> |/
> While with SVN, only this history would be recorded:
> (a+c)
> |
> |
> b
> |
> |
> Questions:
> - is this a normal thing with a DVCS, that i need to get used to? Does
> it add value, in your experience? Or is this useless cluttering of the
> history?

yes this is perfectly normal with a DVCS and it actually better
represents the real progress. You can workaround using "rebase" but
that's not recommended.

> - if it's useless cluttering: how can we avoid it? I guess that's the
> same question as when Gael asked if it was possible to fusion multiple
> commits into 1 commit?

My question was different: my goal was to be able to abuse of local
commits while coding a new features, and once it is somehow ready, I'd
to commit it as a single changeset in order to not clutter the main
repo. I put my solution there:


> Cheers,
> Benoit
> 2009/5/7 Benoit Jacob <jacob.benoit.1@xxxxxxxxx>:
>> 2009/5/7, Benoit Jacob <jacob.benoit.1@xxxxxxxxx>:
>>> That aside, the next steps are:
>>> 0) important: no commit anymore in SVN
>> To clarify: this hasn't started yet. You may still commit to SVN. I'll
>> write again to this list when i'm tagging.
>> Also: Gael I remember you said we needed to clarify the workflow with
>> Hg before doing the move. Good point.
>> So the move hasn't started yet.
>> Benoit

Mail converted by MHonArc 2.6.19+