merge from a topic

[Georges Racinet]

On 4/21/20 3:10 PM, Pierre-Yves David wrote:
> You are right, this is not wokring as expected. We are looking into it.

and for the record, Heptapod is interested, this is what GitLab calls
the "Merge commit with semi-linear history".

https://foss.heptapod.net/heptapod/heptapod/issues/200

I personally think find it to be a very interesting compromise and would
certainly use 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
>>
>

-- 
Georges Racinet
https://octobus.net, https://about.heptapod.host, https://heptapod.net
GPG: BF5456F4DC625443849B6E58EE20CA44EF691D39, sur serveurs publics


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20200602/4a4bb1c1/attachment.asc>