Re: [myhdl-list] Keep hierarchy in VHDL conversion

[Jan D. <ja...@ja...>]

On 05/09/2013 02:09 PM, Angel Ezquerra wrote:
> On Thu, May 9, 2013 at 12:14 PM, Jan Decaluwe <ja...@ja...> wrote:

> That is not true, and probably is the key difference. In mercurial no
> mew commit is ever created when you do hg pull and it is not done when
> you do hg merge either. You must explicitly do hg commit to "confirm"
> your merge (once you do it).

What I meant is that in both cases in the "default" workflow,
a merge commit will eventually appear in the history, so that
you can clearly see how and where the diverged branches converge
(which was your original concern).

hg pull is more like git fetch; it is true that git pull tries
to do many things at once which is not necessarily what you want
on large projects. I prefer git fetch, no idea what most people
do.

Note that for MyHDL there is basically a consensus to stick
with mercurial - I have already put a repo on bitbucket that
I intend to use as the main repo.

-- 
Jan Decaluwe - Resources bvba - http://www.jandecaluwe.com
     Python as a HDL: http://www.myhdl.org
     VHDL development, the modern way: http://www.sigasi.com
     World-class digital design: http://www.easics.com