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
|
Mon, 07 Apr 2014 02:12:28 +0200 |
Mads Kiilerich |
merge: let manifestmerge emit 'keep' actions when keeping wd version
|
Sun, 06 Apr 2014 13:39:51 +0200 |
Mads Kiilerich |
merge: pass merge ancestor to calculateupdates as a list
|
Sun, 06 Apr 2014 13:39:51 +0200 |
Mads Kiilerich |
merge: move ancestor selection tweaking from manifestmerge to update function
|
Sun, 13 Apr 2014 19:01:00 +0200 |
Mads Kiilerich |
spelling: fixes from spell checker
|
Sun, 02 Mar 2014 18:52:16 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in filemerge actions
|
Sun, 02 Mar 2014 18:49:36 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in actions for merge with dir rename
|
Fri, 28 Feb 2014 02:38:33 +0100 |
Mads Kiilerich |
merge: include ancestor node in merge actions
|
Tue, 25 Feb 2014 20:30:08 +0100 |
Mads Kiilerich |
merge: use ancestor filename from planning phase instead of filectx ancestor
|
Tue, 01 Apr 2014 15:11:19 -0500 |
Matt Mackall |
merge with stable
|
Tue, 01 Apr 2014 02:46:03 +0900 |
FUJIWARA Katsunori |
i18n: fix "% inside _()" problems
stable
|
Tue, 01 Apr 2014 02:46:03 +0900 |
FUJIWARA Katsunori |
merge: fix lack of "%s" in format string causing TypeError at runtime
stable
|
Fri, 28 Feb 2014 02:26:03 +0100 |
Mads Kiilerich |
merge: mark mergestate as dirty when resolve changes _state
|
Wed, 05 Mar 2014 10:49:43 -0800 |
Pierre-Yves David |
merge: adds documentation to the mergestate class
|
Wed, 05 Mar 2014 10:22:43 -0800 |
Pierre-Yves David |
merge: add blank line between mergestate's method
|
Tue, 25 Feb 2014 20:29:46 +0100 |
Mads Kiilerich |
merge: use the right ancestor when both sides copied the same file
|
Sun, 02 Mar 2014 18:36:02 +0100 |
Mads Kiilerich |
merge: handle create+delete prompts in calculateupdates
|
Fri, 28 Feb 2014 02:26:03 +0100 |
Mads Kiilerich |
merge: handle acceptremove of create+delete early in manifest merge
|