merge from a topic

Pierre-Yves David pierre-yves.david at ens-lyon.org
Sun Mar 15 19:58:41 UTC 2020


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 ?

Regarding topic in general: the standard way to "remove the topic" when 
the changes are ready is to make the change public (It make the topic 
information fade away). What's is your current setup and when do you 
move your changeset to the public phases ?

On 3/15/20 7:52 PM, Alessandro Dentella wrote:
> 
> 
> Hi,
> 
> I've been testing topics, staks and absorbe and I found it very nice. I',
> working with hg 5.3 and last evolve extension.
> 
> I have a couple of doubts that are unanswered by the tutorial that I found.
> 
> I open a topic and write some changesets, play with them as needed till they
> are just good to be merged into default branch.
> 
> If default has some new changeset, that would be a normal merge. Simple.
> 
> In case default has no new changeset, the real operation would be to just get
> rid of the topic tag, nothing else I guess. What's the proper way to do that?
> 
> If I try to merge hg complains there's nothiong to merge
> 
> TIA
> sandro
> *:-)
> 
> 
> 
> 
> _______________________________________________
> 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