diff mercurial/match.py @ 28118:0e3835c7e1cf

rebase: perform update through the 'update' command The update logic have grow more and more complicated over time (eg bookmark movement, new destination logic, warning on other head, etc). The rebase extension was reimplementing its own basic version of update to be used by 'hg pull --rebase'. We remove the custom code and use a combination of higher level functions. A test is added to check that the update is properly warning about other branch heads.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 14 Feb 2016 00:45:17 +0000
parents d3f1b7ee5e70
children 92f2c69ee5a5
line wrap: on
line diff