Skip to content
Snippets Groups Projects
  • David Soria Parra's avatar
    4a02cf4fbb2e
    merge: respect bookmarks during merge · 4a02cf4fbb2e
    David Soria Parra authored
    Bookmarks will behave more like named branches when merge tries to pick
    a revision to merge.
    
    Bookmarks now to respect the current bookmarks.  Bookmarks will not
    accidentally merged with unnamed heads or other bookmarks. However merge
    can pick heads with diverging bookmarks and pick those automatically.
    
    We end up with two cases for picking a revision to merge:
     (1) In case of an current bookmark, merge can pick a branch head that has a
         diverged bookmark
     (2) In case of no current bookmark, merge can pick a branch head that does not
         have a bookmark.
    4a02cf4fbb2e
    History
    merge: respect bookmarks during merge
    David Soria Parra authored
    Bookmarks will behave more like named branches when merge tries to pick
    a revision to merge.
    
    Bookmarks now to respect the current bookmarks.  Bookmarks will not
    accidentally merged with unnamed heads or other bookmarks. However merge
    can pick heads with diverging bookmarks and pick those automatically.
    
    We end up with two cases for picking a revision to merge:
     (1) In case of an current bookmark, merge can pick a branch head that has a
         diverged bookmark
     (2) In case of no current bookmark, merge can pick a branch head that does not
         have a bookmark.