comparison tests/test-exchange-obsmarkers-case-B6.t @ 35746:e5b6ba786d83

branch: allow changing branch name to existing name if possible With the functionality added in previous patch we can change branches of a revision but not everytime even if it's possible to do so. For example cosider the following case: o 3 added a (foo) o 2 added b (foo) o 1 added c (bar) o 0 added d (bar) Here if I want to change the branch of rev 2,3 to bar, it was not possible and it will say, "a branch with same name exists". This patch allows us to change branch of 2,3 to bar. The underlying logic for changing branch finds the changesets from the revs passed which have no parents in revs. We only support revsets which have only one such root, so to support this we check whether the parent of the root has the same name as that of the new name and if so, we can use the new name to change branches. Differential Revision: https://phab.mercurial-scm.org/D1913
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 19 Jan 2018 18:45:20 +0530
parents b11e8c67fb0f
children 34a46d48d24e
comparison
equal deleted inserted replaced
35745:3bd8ab4c80a5 35746:e5b6ba786d83