Hi Anatoly,
The problem you described appeared since we introduced an stable branch
(i.e. 2.2) for bugfixes only. Its root lies in the fact that neither
Mercurial nor TortoiseHg organize changesets in chronological order but
(I think) in a branch order, i.e. they group changesets by branch when
pulling.
There is even an open bug about it:
https://bitbucket.org/tortoisehg/thg/issue/580/
There a couple of workarounds to this situation:
1. Show changesets of one branch at a time (which can be done quite
easily in TortoiseHg) to have a sane DAG view.
2. Pull quite frequently to have changesets organized by date.
3. Pull changesets one at a time by date, which has the same effect as
2. I've done this a couple of times to avoid the ugly effects you
showed. Maybe you can write a script to do this automatically instead of
by hand (as I did).
Cheers,
Carlos
El 13/11/13 05:19, anatoly techtonik escribió:
Hi Carlos,
I am posting this to ML, because I believe the topic may be important
to understand not-so-obvious incompatibilities of Git vs Mercurial.
About 4 months ago Mercurial history became very hard to review. See
attached screenshot.
I wonder if the cause of this:
* automation tools
* IDE supported process
* git<->hg proxy
* or just the way the process works for somebody who does not need
reviews =)
Carlos, I know you use Git a lot more than Mercurial. Can you please
mention exact sequence of your Mercurial process, so that I can use it
as a starting point to analyze how to make UX for Mercurial process
better?
My bet that there is missing 'hg rebase' somewhere. I do this before
committing changes upstream, but I usually work on one branch only.
Perhaps merges to 'default' branch prevents rebasing, or there is
difficulty with merging the changes during the conflicts (I personally
find three way merges confusing, but I am not using Git that much -
perhaps it can handle them differently or does rebase automatically).
--
You received this message because you are subscribed to the Google Groups
"spyder" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/spyderlib.
For more options, visit https://groups.google.com/groups/opt_out.
