Skip to content
Snippets Groups Projects
  1. Mar 07, 2013
  2. May 14, 2014
  3. Dec 24, 2012
    • kiilerix's avatar
      bookmarks: fix head selection for merge with two bookmarked heads · 730b769fb634
      kiilerix authored
      A type mismatch caused the search for the other head to fail. The code is
      fragile, and instead it ended up using the 'first' bookmark head, but the
      ordering is undefined and it could thus randomly use the wrong bookmarkhead
      and fail with:
      
        $ hg up -q -C e@diverged
        $ hg merge
        abort: merging with a working directory ancestor has no effect
      730b769fb634
  4. Aug 27, 2012
  5. May 13, 2012
    • David Soria Parra's avatar
      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
  6. May 12, 2012
Loading