Mercurial > hg

log mercurial/merge.py @ 23539:cb42050f2dad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -60 tip
age author description
Wed, 03 Dec 2014 13:50:28 -0800 Martin von Zweigbergk merge: extract _resolvetrivial() function
Tue, 09 Dec 2014 16:49:55 -0800 Martin von Zweigbergk merge: don't treat 'diverge' and 'renamedelete' like actions
Tue, 09 Dec 2014 14:18:31 -0800 Martin von Zweigbergk merge: move dr/rd warning messages out of applyupdates()
Fri, 05 Dec 2014 16:13:26 -0800 Martin von Zweigbergk merge: don't report progress for dr/rd actions
Wed, 03 Dec 2014 14:03:20 -0800 Martin von Zweigbergk merge: make 'keep' message more descriptive
Fri, 05 Dec 2014 12:10:56 -0600 Matt Mackall merge with stable
Wed, 03 Dec 2014 11:02:52 -0800 Martin von Zweigbergk merge: don't overwrite conflicting file in locally renamed directory
Wed, 03 Dec 2014 10:56:07 -0800 Martin von Zweigbergk merge: don't ignore conflicting file in remote renamed directory
Sun, 23 Nov 2014 15:08:50 -0800 Martin von Zweigbergk merge: duplicate 'if f in copied' into each branch
Sun, 23 Nov 2014 14:09:10 -0800 Martin von Zweigbergk merge: branch code into {n1 and n2, n1, n2} top-level cases
Sun, 16 Nov 2014 23:41:44 -0800 Martin von Zweigbergk update: don't overwrite untracked ignored files on update stable
Wed, 26 Nov 2014 10:25:27 -0800 Martin von Zweigbergk merge: display modify/delete conflict prompts in sorted order
Mon, 01 Dec 2014 19:34:11 -0600 Matt Mackall merge with stable
Mon, 01 Dec 2014 02:30:21 +0100 Mads Kiilerich merge: before cd/dc prompt, check that changed side really changed stable 3.2.2
Wed, 26 Nov 2014 15:37:01 -0800 Pierre-Yves David manifest: document the extra letter in working copy manifest node
Sun, 30 Nov 2014 19:26:53 +0100 Mads Kiilerich merge: 0 is a valid ancestor different from None
Mon, 24 Nov 2014 16:17:02 -0800 Martin von Zweigbergk merge: use None as filename for base in 'both created' conflicts
Mon, 24 Nov 2014 16:42:36 -0800 Martin von Zweigbergk merge: break out "both renamed a -> b" case
Mon, 24 Nov 2014 16:16:34 -0800 Martin von Zweigbergk merge: separate out "both created" cases
Mon, 24 Nov 2014 16:11:22 -0800 Martin von Zweigbergk merge: indent to prepare for next patch
Mon, 24 Nov 2014 09:50:27 -0800 Martin von Zweigbergk merge: remove obsolete check for untracked files in 'dm' action
Sun, 23 Nov 2014 23:10:34 -0800 Martin von Zweigbergk merge: remove dead assignment in applyupdates()
Fri, 21 Nov 2014 13:06:04 -0800 Martin von Zweigbergk merge: move calculateupdates() before applyupdated()
Mon, 24 Nov 2014 11:28:46 -0800 Martin von Zweigbergk merge: remove unused variables from _checkcollision()
Thu, 20 Nov 2014 16:39:32 -0800 Martin von Zweigbergk merge: consistently use single quotes for non-user-facing strings
Wed, 19 Nov 2014 08:50:08 -0800 Martin von Zweigbergk merge: remove confusing comment about --force
Tue, 18 Nov 2014 16:14:32 -0800 Martin von Zweigbergk update: remove unnecessary check for unknown files with --check
Fri, 14 Nov 2014 09:33:28 -0800 Martin von Zweigbergk manifestmerge: use already existing fl2 synonym for m2.flags(f)
Thu, 13 Nov 2014 23:12:15 -0800 Martin von Zweigbergk merge: drop underscore prefix from _checkunknown()
Tue, 14 Oct 2014 23:18:07 -0700 Martin von Zweigbergk manifest: transpose pair of pairs from diff()
Tue, 14 Oct 2014 22:48:44 -0700 Martin von Zweigbergk manifest: for diff(), only iterate over files, not flags
Tue, 14 Oct 2014 17:09:16 -0700 Martin von Zweigbergk manifest: repurpose flagsdiff() into (node-and-flag)diff()
Mon, 13 Oct 2014 17:12:12 -0500 Matt Mackall merge: add merge.graft helper
Wed, 08 Oct 2014 14:16:53 -0700 Martin von Zweigbergk merge: make error message consistent with other commands
Tue, 07 Oct 2014 00:41:58 -0700 Pierre-Yves David merge.update: use `first` instead of direct indexing
Wed, 01 Oct 2014 03:42:00 +0200 Mads Kiilerich merge: mute the status message when bid merge kicks in
Wed, 01 Oct 2014 03:41:11 +0200 Mads Kiilerich merge: use bid merge by default (BC)
Fri, 05 Sep 2014 11:36:20 -0700 Durham Goode dirstate: wrap setparent calls with begin/endparentchange (issue4353)
Fri, 15 Aug 2014 11:48:05 -0500 Matt Mackall merge with stable
Fri, 15 Aug 2014 16:20:47 +0200 Mads Kiilerich cleanup: avoid local vars shadowing imports
Fri, 15 Aug 2014 02:39:01 +0200 Mads Kiilerich merge: show the scary multiple ancestor hint for merges only, not for updates stable
Fri, 02 May 2014 01:09:14 +0200 Mads Kiilerich merge: fix stupid indentation left over from previous refactorings
Fri, 28 Feb 2014 02:25:58 +0100 Mads Kiilerich merge: use separate lists for each action type
Thu, 08 May 2014 16:54:23 -0700 Durham Goode merge: add labels parameter from merge.update to filemerge
Fri, 09 May 2014 12:01:56 +0200 Mads Kiilerich merge: separate worker functions for batch remove and batch get
Tue, 22 Apr 2014 02:10:25 +0200 Mads Kiilerich merge: change debug logging - test output changes but no real changes
Thu, 15 May 2014 02:14:59 +0200 Mads Kiilerich merge: move constant assignments a bit and use them more
Fri, 02 May 2014 01:09:14 +0200 Mads Kiilerich merge: change priority / ordering of merge actions
Tue, 22 Apr 2014 02:09:24 +0200 Mads Kiilerich merge: make debug output slightly more helpful by including message for action
Sun, 13 May 2012 17:45:08 +0200 Mads Kiilerich merge: simplify mergestate iter
Fri, 18 Apr 2014 22:19:25 -0700 Gregory Szorc resolve: print message when no unresolved files remain (issue4214)
Fri, 18 Apr 2014 19:08:32 -0700 Gregory Szorc resolve: abort when not applicable (BC)
Thu, 08 May 2014 16:48:28 -0700 Gregory Szorc mergestate: consistently set variables to None
Wed, 30 Apr 2014 14:19:01 -0500 Matt Mackall ancestor: silence multiple ancestor warning outside of merge (issue4234) stable
Mon, 21 Apr 2014 20:24:54 +0200 Mads Kiilerich merge: improve notes for listing the bids for ambiguous merges stable
Fri, 18 Apr 2014 13:33:20 +0200 Mads Kiilerich merge: tell the user when we are using bid merge stable
Mon, 21 Apr 2014 20:22:14 +0200 Mads Kiilerich merge: fix stray character in bid merge message stable
Mon, 21 Apr 2014 19:53:19 +0200 Mads Kiilerich merge: fix wrong number of arguments for bid merge message stable
Mon, 21 Apr 2014 15:08:39 -0500 Matt Mackall merge: fix test failures with new merge code on OS X stable
Fri, 28 Feb 2014 02:52:32 +0100 Mads Kiilerich merge: with merge.preferancestor=*, run an auction with bids from ancestors
less more | (0) -300 -100 -60 tip