Mercurial Mercurial > hg-stable / file revisions
summary | shortlog | changelog | graph | tags | bookmarks | branches | file | revisions | annotate | diff | comparison | rss | help
(0) -300 -100 -60 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
Wed, 01 Oct 2014 03:42:00 +0200 Mads Kiilerich merge: mute the status message when bid merge kicks in file | diff | annotate
Wed, 01 Oct 2014 03:41:11 +0200 Mads Kiilerich merge: use bid merge by default (BC) file | diff | annotate
Fri, 05 Sep 2014 11:36:20 -0700 Durham Goode dirstate: wrap setparent calls with begin/endparentchange (issue4353) file | diff | annotate
Fri, 15 Aug 2014 11:48:05 -0500 Matt Mackall merge with stable file | diff | annotate
Fri, 15 Aug 2014 16:20:47 +0200 Mads Kiilerich cleanup: avoid local vars shadowing imports file | diff | annotate
Fri, 15 Aug 2014 02:39:01 +0200 Mads Kiilerich merge: show the scary multiple ancestor hint for merges only, not for updates stable file | diff | annotate
Fri, 02 May 2014 01:09:14 +0200 Mads Kiilerich merge: fix stupid indentation left over from previous refactorings file | diff | annotate
Fri, 28 Feb 2014 02:25:58 +0100 Mads Kiilerich merge: use separate lists for each action type file | diff | annotate
Thu, 08 May 2014 16:54:23 -0700 Durham Goode merge: add labels parameter from merge.update to filemerge file | diff | annotate
Fri, 09 May 2014 12:01:56 +0200 Mads Kiilerich merge: separate worker functions for batch remove and batch get file | diff | annotate
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes file | diff | annotate
Thu, 15 May 2014 02:14:59 +0200 Mads Kiilerich merge: move constant assignments a bit and use them more file | diff | annotate
Fri, 02 May 2014 01:09:14 +0200 Mads Kiilerich merge: change priority / ordering of merge actions file | diff | annotate
Tue, 22 Apr 2014 02:09:24 +0200 Mads Kiilerich merge: make debug output slightly more helpful by including message for action file | diff | annotate
Sun, 13 May 2012 17:45:08 +0200 Mads Kiilerich merge: simplify mergestate iter file | diff | annotate
Fri, 18 Apr 2014 22:19:25 -0700 Gregory Szorc resolve: print message when no unresolved files remain (issue4214) file | diff | annotate
Fri, 18 Apr 2014 19:08:32 -0700 Gregory Szorc resolve: abort when not applicable (BC) file | diff | annotate
Thu, 08 May 2014 16:48:28 -0700 Gregory Szorc mergestate: consistently set variables to None file | diff | annotate
Wed, 30 Apr 2014 14:19:01 -0500 Matt Mackall ancestor: silence multiple ancestor warning outside of merge (issue4234) stable file | diff | annotate
Mon, 21 Apr 2014 20:24:54 +0200 Mads Kiilerich merge: improve notes for listing the bids for ambiguous merges stable file | diff | annotate
Fri, 18 Apr 2014 13:33:20 +0200 Mads Kiilerich merge: tell the user when we are using bid merge stable file | diff | annotate
Mon, 21 Apr 2014 20:22:14 +0200 Mads Kiilerich merge: fix stray character in bid merge message stable file | diff | annotate
Mon, 21 Apr 2014 19:53:19 +0200 Mads Kiilerich merge: fix wrong number of arguments for bid merge message stable file | diff | annotate
Mon, 21 Apr 2014 15:08:39 -0500 Matt Mackall merge: fix test failures with new merge code on OS X stable file | diff | annotate
Fri, 28 Feb 2014 02:52:32 +0100 Mads Kiilerich merge: with merge.preferancestor=*, run an auction with bids from ancestors file | diff | annotate
Mon, 07 Apr 2014 02:12:28 +0200 Mads Kiilerich merge: let manifestmerge emit 'keep' actions when keeping wd version file | diff | annotate
Sun, 06 Apr 2014 13:39:51 +0200 Mads Kiilerich merge: pass merge ancestor to calculateupdates as a list file | diff | annotate
Sun, 06 Apr 2014 13:39:51 +0200 Mads Kiilerich merge: move ancestor selection tweaking from manifestmerge to update function file | diff | annotate
Sun, 13 Apr 2014 19:01:00 +0200 Mads Kiilerich spelling: fixes from spell checker file | diff | annotate
Sun, 02 Mar 2014 18:52:16 +0100 Mads Kiilerich merge: keep destination filename as key in filemerge actions file | diff | annotate
Sun, 02 Mar 2014 18:49:36 +0100 Mads Kiilerich merge: keep destination filename as key in actions for merge with dir rename file | diff | annotate
Fri, 28 Feb 2014 02:38:33 +0100 Mads Kiilerich merge: include ancestor node in merge actions file | diff | annotate
Tue, 25 Feb 2014 20:30:08 +0100 Mads Kiilerich merge: use ancestor filename from planning phase instead of filectx ancestor file | diff | annotate
Tue, 01 Apr 2014 15:11:19 -0500 Matt Mackall merge with stable file | diff | annotate
Tue, 01 Apr 2014 02:46:03 +0900 FUJIWARA Katsunori i18n: fix "% inside _()" problems stable file | diff | annotate
Tue, 01 Apr 2014 02:46:03 +0900 FUJIWARA Katsunori merge: fix lack of "%s" in format string causing TypeError at runtime stable file | diff | annotate
Fri, 28 Feb 2014 02:26:03 +0100 Mads Kiilerich merge: mark mergestate as dirty when resolve changes _state file | diff | annotate
Wed, 05 Mar 2014 10:49:43 -0800 Pierre-Yves David merge: adds documentation to the mergestate class file | diff | annotate
Wed, 05 Mar 2014 10:22:43 -0800 Pierre-Yves David merge: add blank line between mergestate's method file | diff | annotate
Tue, 25 Feb 2014 20:29:46 +0100 Mads Kiilerich merge: use the right ancestor when both sides copied the same file file | diff | annotate
Sun, 02 Mar 2014 18:36:02 +0100 Mads Kiilerich merge: handle create+delete prompts in calculateupdates file | diff | annotate
Fri, 28 Feb 2014 02:26:03 +0100 Mads Kiilerich merge: handle acceptremove of create+delete early in manifest merge file | diff | annotate
Sat, 01 Mar 2014 21:08:28 -0500 Augie Fackler merge with stable file | diff | annotate
Sat, 01 Mar 2014 18:09:39 +0100 Mads Kiilerich merge: audit the right destination file when merging with dir rename stable 2.9.1 file | diff | annotate
Fri, 28 Feb 2014 02:28:12 +0100 Olle Lundberg merge: fix spelling of length file | diff | annotate
Tue, 25 Feb 2014 18:45:01 -0800 Pierre-Yves David resolve: use "other" changeset from merge state (issue4163) stable file | diff | annotate
Tue, 25 Feb 2014 18:54:47 -0800 Pierre-Yves David merge: add "other" file node in the merge state file stable file | diff | annotate
Thu, 27 Feb 2014 14:14:57 -0800 Pierre-Yves David merge: infer the "other" changeset when falling back to v1 format stable file | diff | annotate
Tue, 25 Feb 2014 18:42:11 -0800 Pierre-Yves David merge: record the "other" node in merge state stable file | diff | annotate
Tue, 25 Feb 2014 18:37:06 -0800 Pierre-Yves David merge: introduce new format for the state file stable file | diff | annotate
Thu, 27 Feb 2014 12:59:41 -0800 Pierre-Yves David merge: change the merge state serialisation to use a record based logic stable file | diff | annotate
Tue, 25 Feb 2014 17:14:49 -0800 Pierre-Yves David merge: move merge state file path into a constant stable file | diff | annotate
Mon, 10 Feb 2014 00:43:54 +0100 Mads Kiilerich merge: don't overwrite file untracked after remove, abort with 'untracked files' stable file | diff | annotate
Wed, 15 Jan 2014 16:41:18 -0600 Sean Farley merge: consider successor changesets for a bare update file | diff | annotate
Wed, 06 Nov 2013 17:02:07 -0600 Sean Farley merge: refactor initialization of variables in update file | diff | annotate
Wed, 06 Nov 2013 10:26:25 -0600 Sean Farley merge: update comment for future devs file | diff | annotate
Wed, 06 Nov 2013 10:20:18 -0800 Siddharth Agarwal merge: move forgets to the beginning of the action list stable file | diff | annotate
Thu, 24 Oct 2013 01:49:56 +0800 Mads Kiilerich spelling: random spell checker fixes stable file | diff | annotate
Tue, 01 Oct 2013 17:43:54 -0700 Siddharth Agarwal merge: exit early during a no-op update (BC) file | diff | annotate
Mon, 23 Sep 2013 20:53:14 -0700 Siddharth Agarwal merge: standardize error message for dirty subrepo file | diff | annotate
less more (0) -300 -100 -60 tip
hg-stable