Skip to content
Snippets Groups Projects
  • Pierre-Yves David's avatar
    72072cfc
    update: warn about other topological heads on bare update · 72072cfc
    Pierre-Yves David authored
    A concern around the user experience of Mercurial is user getting stuck on there
    own topological branch forever. For example, someone pulling another topological
    branch, missing that message in pull asking them to merge and getting stuck on
    there own local branch.
    
    The current way to "address" this concern was for bare 'hg update' to target the
    tipmost (also latest pulled) changesets and complain when the update was not
    linear. That way, failure to merge newly pulled changesets would result in some
    kind of failure.
    
    Yet the failure was quite obscure, not working in all cases (eg: commit right
    after pull) and the behavior was very impractical in the common case
    (eg: issue4673).
    
    To be able to change that behavior, we need to provide other ways to alert a
    user stucks on one of many topological head. We do so with an extra message after
    bare update:
    
      1 other heads for branch "default"
    
    Bookmark get its own special version:
    
      1 other divergent bookmarks for "foobar"
    
    There is significant room to improve the message itself, and we should augment
    it with hint about how to see theses other heads or handle the situation (see
    in-line comment). But having "a" message is already a significant improvement
    compared to the existing situation. Once we have it we can iterate on a better
    version of it. As having such message is an important step toward changing the
    default destination for update and other nicety, I would like to move forward
    quickly on getting such message.
    
    This was discussed during London - October 2015 Sprint.
    72072cfc
    History
    update: warn about other topological heads on bare update
    Pierre-Yves David authored
    A concern around the user experience of Mercurial is user getting stuck on there
    own topological branch forever. For example, someone pulling another topological
    branch, missing that message in pull asking them to merge and getting stuck on
    there own local branch.
    
    The current way to "address" this concern was for bare 'hg update' to target the
    tipmost (also latest pulled) changesets and complain when the update was not
    linear. That way, failure to merge newly pulled changesets would result in some
    kind of failure.
    
    Yet the failure was quite obscure, not working in all cases (eg: commit right
    after pull) and the behavior was very impractical in the common case
    (eg: issue4673).
    
    To be able to change that behavior, we need to provide other ways to alert a
    user stucks on one of many topological head. We do so with an extra message after
    bare update:
    
      1 other heads for branch "default"
    
    Bookmark get its own special version:
    
      1 other divergent bookmarks for "foobar"
    
    There is significant room to improve the message itself, and we should augment
    it with hint about how to see theses other heads or handle the situation (see
    in-line comment). But having "a" message is already a significant improvement
    compared to the existing situation. Once we have it we can iterate on a better
    version of it. As having such message is an important step toward changing the
    default destination for update and other nicety, I would like to move forward
    quickly on getting such message.
    
    This was discussed during London - October 2015 Sprint.