- Mar 07, 2013
-
-
Stephen Lee authored
When updating to a bookmark, mention that the bookmark is now active. This is a reminder that update does not move the current bookmark if an explicit target is given - instead it activates that target.
-
- May 14, 2014
-
-
Siddharth Agarwal authored
This helps prevent user confusion when innocent-seeming commands like 'hg update -C .' are run.
-
- Dec 24, 2012
-
-
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
-
- Aug 27, 2012
-
-
John Li authored
45b5eb2941d0 fixed an error that occured when heads being merged were both inactive bookmarks. Add a test for that case.
-
- May 13, 2012
-
-
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.
-
- May 12, 2012
-
-
David Soria Parra authored
-