merge from a topic

Pierre-Yves David pierre-yves.david at ens-lyon.org
Tue Apr 21 13:10:54 UTC 2020


You are right, this is not wokring as expected. We are looking into it.

On 3/21/20 9:15 PM, Uwe Brauer wrote:
>>>> "PD" == Pierre-Yves David <pierre-yves.david at ens-lyon.org> writes:
> 
>     > Regarding you merge attempt: Even if the topic is purely ahead of the
>     > changesets, I think you should be able to merge the topic. Can you
>     > share the graph you have and the error you get ?
> 
> I am not sure I understand what you are saying but the following is NOT
> possible
> 
> hg init
> echo "First" > test.org
> hg add test.org
> hg commit -u "Bernhard Riemann <bernhard.riemann at gmail.com>" -m "First"
> echo "Second" >> test.org
> hg commit -u "Bernhard Riemann <bernhard.riemann at gmail.com>" -m "Second"
> echo "Third" >> test.org
> hg commit -u "Bernhard Riemann <bernhard.riemann at gmail.com>" -m "Third"
> echo "Forth" >> test.org
> hg commit  -m "Fourth"
> hg topics NewTopic
> echo "Fifth" >> test.org
> hg commit  -m "Fifth"
> echo "Six" >> test.org
> hg commit  -m "Six"
> hg log -G
> hg heads
> 
> 
> This is  linear history if you had created a Named Branch instead of
> Topic, I could merge tip into changeset (local number) 3. But with a
> topic I cannot.
> 
> But maybe I misunderstand your proposal.
> 
> Regards
> 
> Uwe Brauer
> 
> 
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial
> 

-- 
Pierre-Yves David


More information about the Mercurial mailing list