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

[Angel E. <ang...@gm...>]

On Thu, May 9, 2013 at 4:04 PM, Jan Decaluwe <ja...@ja...> wrote:
> 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).

OK, I understand what you meant now.

> 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.

I also think using git fetch is the sensible thing to do, but it is
not what I've seen people use most of the time, which I find quite
weird.

> 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.

Yes, I know that. I was just trying to answer Chris Felton's question
about why I prefer mercurial to git.

Cheers,

Angel