"Push creates new remote heads" and my humble workflow (kind of dummy question)

Victor Sudakov vas at sibptus.ru
Tue Jul 21 07:26:15 UTC 2020


Pierre-Yves David wrote:
> On 7/18/20 6:13 PM, Victor Sudakov wrote:

[dd]

> > 
> > a) what will happen when I push this rearranged history back into the
> > cloud repo?
> 
> Mercurial has a phase concept. By default, you will not be able to rebase
> content you have pulled (or already pushed). So you are not "pushing back"
> anything since you push the version without merge from the start.
> 
> > b) do I need to hint to rebase what it should rebase on what? How
> > does it know that it should put C on top of B, and not vice versa? Does
> > it just always put the working copy topological branch on top of the
> > pulled branch?
> 
> If there are only one other head, hg rebase will pick that. Otherwise, you
> can use `hg rebase --dest DESTINATION-REV`. You can also have a look at `hg
> help rebase` in general.
> 

Thanks Pierre-Yves, I think this is beginning to make sense to me.

-- 
Victor Sudakov,  VAS4-RIPE, VAS47-RIPN
2:5005/49 at fidonet http://vas.tomsk.ru/



More information about the Mercurial mailing list