mercurial for dummies (newbies), remote heads etc

[Pierre-Yves David]

On 6/15/20 8:40 PM, Uwe Brauer wrote:
>>>> "PD" == Pierre-Yves David <pierre-yves.david at ens-lyon.org> writes:
> 
> Hi
> 
> I only saw you response today.
> 
> 
>     > On 5/28/20 8:32 PM, Uwe Brauer wrote:
>     >> maybe I should have told them about the fetch command, but if
>     >> there is a conflicting merge, thinks can get worse.
> 
>     > Do you have details on what's their trouble with merge ?
> 
> Well I think some have  still have not gasped the conceptual concept  of
> merging (I will have to talk
> to them), but those who have gasped it expect that the server sort out the
> merging, so they push and they expect the server to do the merge, so I
> guess the concept of  DVCS is alien to them and I thing that is why
> subversion model was so successful [1] .
>     > Do they have
>     > trouble with the concept has a whole ? are they confused about when to
>     > run the command ? do they have trouble with conflict resolution ? If
>     > so, which tool to they use.
> 
> No I really try to to conflicting merging myself and try to spare them
> that trouble.
> 
>     > (side note: having the ability to commit and push conflict would solve
>     > this usecase)
> 
>     >> a. So I thought have having used named branches (one collaborator
>     >> one branch), and I do the merge, but sooner or later similar
>     >> problems occur.
> 
>     > It is not part of the standard distribution, but topic has a mode to
>     > automatically assign a topic to any new commit. That would be
>     > "[experimental] \n topic-mode = random-all". combined with a non
> 
> Wait wait I did not know about that feature, starting form which version
> this feature is available?

I think this was implemented at the time of the sprint in dublin, so 
2017 IIRC.

>     > publishing repository, that would let them push their change while you
>     > do the merging/publishing.
> 
> I thought of topics also also, but it is my understanding that they need
> evolve to be installed, and this seemed to me to complicated, since some
> are using linux, some Mac some windows.

Evolve (and topic) will be shipped with Tortoise hg. On other plateform, 
you can get it using `pip install --user hg-evolve`


-- 
Pierre-Yves David