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
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
Mon, 23 Sep 2013 20:50:51 -0700 Siddharth Agarwal merge: standardize error message for dirty working dir file | diff | annotate
Mon, 23 Sep 2013 20:33:02 -0700 Siddharth Agarwal update: standardize error message for dirty update --check file | diff | annotate
Mon, 23 Sep 2013 20:08:52 -0700 Siddharth Agarwal update: improve error message for dirty non-linear update with rev file | diff | annotate
Mon, 23 Sep 2013 20:07:30 -0700 Siddharth Agarwal update: add error message for dirty non-linear update with no rev file | diff | annotate
Mon, 23 Sep 2013 17:43:33 -0700 Siddharth Agarwal update: improve error message for clean non-linear update file | diff | annotate
Thu, 25 Jul 2013 00:33:28 -0500 Matt Mackall update: add tracking of interrupted updates (issue3113) stable file | diff | annotate
Mon, 03 Jun 2013 17:20:37 -0700 Bryan O'Sullivan merge: add a files method to the mergestate class file | diff | annotate
Wed, 22 May 2013 17:31:43 -0500 Matt Mackall ui: merge prompt text components into a singe string file | diff | annotate
Wed, 08 May 2013 14:11:01 -0700 Siddharth Agarwal manifestmerge: local unknown, remote created: don't traverse symlinks file | diff | annotate
Tue, 30 Apr 2013 05:01:32 +0900 FUJIWARA Katsunori icasefs: rewrite case-folding collision detection (issue3452) stable file | diff | annotate
Mon, 29 Apr 2013 15:58:15 +0900 FUJIWARA Katsunori merge: increase safety of parallel updating/removing on icasefs stable file | diff | annotate
Tue, 16 Apr 2013 15:33:18 +0200 Pierre-Yves David update: allow dirty update to foreground (successors) file | diff | annotate
Wed, 10 Apr 2013 12:34:42 -0700 Siddharth Agarwal manifestmerge: handle workdir removed, remote removed with flags file | diff | annotate
Thu, 04 Apr 2013 16:37:37 -0500 Matt Mackall merge with stable file | diff | annotate
Mon, 18 Mar 2013 16:37:20 -0500 Kevin Bullock applyupdates: assign variable before we try to use it (issue3855) stable 2.5.4 file | diff | annotate
Sun, 24 Mar 2013 16:56:25 -0700 Siddharth Agarwal manifestmerge: drop redundant flags calls file | diff | annotate
Mon, 25 Mar 2013 17:41:06 -0700 Siddharth Agarwal manifestmerge: use dicthelpers.diff and join file | diff | annotate
Sun, 24 Mar 2013 16:43:25 -0700 Siddharth Agarwal manifestmerge: rename n to n1 and n2 file | diff | annotate
Mon, 18 Mar 2013 16:37:20 -0500 Kevin Bullock applyupdates: assign variable before we try to use it (issue3855) file | diff | annotate
Fri, 15 Mar 2013 11:23:29 -0700 Durham Goode rebase: fix --collapse when a file was added then removed file | diff | annotate
Sun, 10 Feb 2013 16:55:01 +0000 Siddharth Agarwal manifestmerge: fix order in which manifests are fetched file | diff | annotate
Sun, 10 Feb 2013 12:16:46 +0000 Siddharth Agarwal merge: run _forgetremoved after manifestmerge file | diff | annotate
Sat, 09 Feb 2013 15:51:32 -0800 Bryan O'Sullivan merge: don't fiddle with name lookups or i18n in hot loops file | diff | annotate
Sat, 09 Feb 2013 15:51:32 -0800 Bryan O'Sullivan merge: apply non-interactive working dir updates in parallel file | diff | annotate
Sat, 09 Feb 2013 15:22:09 -0800 Bryan O'Sullivan merge: report non-interactive progress in chunks file | diff | annotate
less more (0) -300 -100 -60 tip
hg-stable