Re: [myhdl-list] Another typo in docs

[Henry G. <he...@ca...>]

On 06/01/15 04:23, Christopher Felton wrote:
>> >My hg-fu is low, so I've no idea what's going on with multiple heads and
>> >whatnot - I'd appreciate being enlightened. It's not exactly intuitive!
>> >
> hg multiple heads, usually need to be merged.  This is
> the default case when you are modifying your local copy
> (tip) and then pull from somewhere else.  The cure is
> typically a merge.  If you merge right after a pull all
> works.  if not you might have to specify the heads to
> merge, something like:
>
>      >> hg heads
>      >> hg merge tip ...
>
> More information here:
> http://mercurial.selenic.com/wiki/MultipleHeads
>
> This post uses nice diagrams (Directed Acyclic Graph
> (a DAG)) to show how heads are created and merged, and
> merge vs. rebase.  This might help visualize what is
> going on.
> http://softwareswirl.blogspot.com/2009/04/truce-in-merge-vs-rebase-war.html
>
> This might be helpful:
> http://mercurial.selenic.com/wiki/GitConcepts
Thanks for that.

Is my repository in a fit state for a PR? It doesn't seem to be 
complaining about multiple heads at the moment.

I can fold in any changes that come out of the current discussions about 
the best doctest strategy.

Henry