Topic pull and push

Pierre-Yves David pierre-yves.david at ens-lyon.org
Wed Jul 12 13:57:26 UTC 2017


On 07/11/2017 11:51 PM, Long Vu wrote:
> On Sat, Jul 8, 2017 at 8:56 AM, Pierre-Yves David
> <pierre-yves.david at ens-lyon.org> wrote:
>>
>>
>> On 07/08/2017 06:30 AM, Long Vu wrote:
>>>
>>> Hi,
>>>
>>> I've been using evolve with named branch pushing to and pulling from a
>>> non-publishing repo to collaborate with my team on various concurrent
>>> features/bug fixes.
>>>
>>> It works great as each of us or each feature has its own branch.  The
>>> temporary branch disappear when we rebase on the release branch.  So the
>>> workflow is clean easily manageable.
>>>
>>> I'd like to use topic instead of named branch to save us from having to do
>>> a rebase at the end.  But I want to preserve our current workflow that feels
>>> so great.
>>>
>>> Looking at the various test-*.t I see a test-topic-push.t but nothing
>>> about pulling.
>>>
>>> If I push a topic to a non-publishing repo and my teammate pull, will the
>>> topic persist on his side?  If he amends a few, add some new commits on the
>>> topic and push it back, when I pull, will I get his amended update on the
>>> same topic on my side?
>>
>>
>> The topic persist on all side as long as your use non-publishing repository.
>>
>> You'll get the amended/new changes on the same topic just as with named
>> branch.
>>
>>> If I "release" the topic by pushing to a pblishing repo, then push again
>>> to the non-publishing repo to clear the topic, when my teammate pull from
>>> that non-publishing repo, will that clear the topic on his side as well?
>>
>>
>> Yes, the topic with fade away on all repo, when the changesets become
>> public.
>>
> 
> Do I also have to enable topic on the server (like for evolve) for the
> round-trip push-pull to work?

You do not have to enable topic on the server for topic to be 
transmitted. that will work with any verison of Mercurial on the server

On the other hand, if you enable topic on the server, you will be able 
to push new topic without --force. (all other new branch/head prevention 
security will remain in place).

> Server do not have latest mercurial + evolve.  What is the minimum
> version of mercurial + evolve + topic I should use?

We recommend using the latest version of both. If upgrading Mercurial is 
hard, evolve is compatible back to 3.8 (but some feature requires new 
versions). If you want to use topic I strongly recommend using the 
latest evolve release, Pulkit Goyal fixed maybe bugs in that one.

Cheers,

-- 
Pierre-Yves David



More information about the Evolve-testers mailing list