Mercurial > hg

comparison tests/test-merge6.t @ 19111:6439d78e14fb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: resolve divergent bookmark when moving across a branch This patch resolves a single divergent bookmark if a divergent bookmark exists in the target revision and it current bookmark is not an ancestor of the target revision, else it would already be handled by the previous patch in this series. Test coverage is added.
author Sean Farley <sean.michael.farley@gmail.com>
date Tue, 30 Apr 2013 21:12:49 -0500
parents f2719b387380
children 2428e8ec0793
comparison
equal deleted inserted replaced
19110:741d94aa92e4 19111:6439d78e14fb