| Wed, 19 Aug 2015 14:05:42 -0500 |
Matt Mackall |
bidmerge: choose shortest list of diverge and rename/delete warnings
|
file |
diff |
annotate
|
| Fri, 18 Sep 2015 17:23:10 -0700 |
Pierre-Yves David |
update: move default destination into a revset
|
file |
diff |
annotate
|
| Wed, 16 Sep 2015 12:36:21 -0700 |
Siddharth Agarwal |
merge: move merge step to the end
|
file |
diff |
annotate
|
| Sat, 08 Aug 2015 19:41:25 -0700 |
Gregory Szorc |
merge: use absolute_import
|
file |
diff |
annotate
|
| Thu, 25 Jun 2015 17:54:55 -0500 |
Matt Mackall |
merge: make merge.preferancestor type and default consistent
|
file |
diff |
annotate
|
| Thu, 25 Jun 2015 17:53:16 -0500 |
Matt Mackall |
merge: mark ancient debugging option
|
file |
diff |
annotate
|
| Wed, 08 Jul 2015 17:01:09 +0900 |
FUJIWARA Katsunori |
merge: remove useless dirstate.normallookup() invocation in applyupdates()
|
file |
diff |
annotate
|
| Tue, 23 Jun 2015 22:20:08 -0700 |
Gregory Szorc |
global: mass rewrite to use modern exception syntax
|
file |
diff |
annotate
|
| Sat, 16 May 2015 14:34:19 -0400 |
Augie Fackler |
cleanup: use __builtins__.all instead of util.all
|
file |
diff |
annotate
|
| Wed, 29 Apr 2015 15:52:31 -0400 |
Matt Harbison |
merge: run update hook after the last wlock release
stable
|
file |
diff |
annotate
|
| Sun, 05 Apr 2015 11:55:38 -0700 |
Durham Goode |
graft: allow creating sibling grafts
|
file |
diff |
annotate
|
| Wed, 25 Mar 2015 13:55:35 +0900 |
FUJIWARA Katsunori |
subrepo: add bailifchanged to centralize raising Abort if subrepo is dirty
|
file |
diff |
annotate
|
| Fri, 30 Jan 2015 04:59:05 +0900 |
FUJIWARA Katsunori |
merge: mark .hgsubstate as possibly dirty before submerge for consistency
stable
|
file |
diff |
annotate
|
| Sun, 11 Jan 2015 01:51:52 +0100 |
Angel Ezquerra |
localrepo: remove all external users of localrepo.wopener
|
file |
diff |
annotate
|
| Thu, 15 Jan 2015 23:17:12 +0100 |
Angel Ezquerra |
localrepo: remove all external users of localrepo.opener
|
file |
diff |
annotate
|
| Thu, 18 Dec 2014 09:22:09 -0800 |
Martin von Zweigbergk |
merge: move checking of unknown files out of manifestmerge()
|
file |
diff |
annotate
|
| Sat, 13 Dec 2014 23:52:22 -0800 |
Martin von Zweigbergk |
merge: extract method for checking for conflicting untracked file
|
file |
diff |
annotate
|
| Mon, 15 Dec 2014 16:45:19 -0800 |
Martin von Zweigbergk |
merge: create 'cm' action for 'get or merge' case
|
file |
diff |
annotate
|
| Fri, 12 Dec 2014 23:18:36 -0800 |
Martin von Zweigbergk |
merge: don't overwrite untracked file at directory rename target
|
file |
diff |
annotate
|
| Tue, 18 Nov 2014 20:29:25 -0800 |
Martin von Zweigbergk |
merge: remove constant tuple element from 'aborts'
|
file |
diff |
annotate
|
| Wed, 19 Nov 2014 11:51:31 -0800 |
Martin von Zweigbergk |
merge: collect checking for unknown files at end of manifestmerge()
|
file |
diff |
annotate
|
| Wed, 19 Nov 2014 11:48:30 -0800 |
Martin von Zweigbergk |
merge: introduce 'c' action like 'g', but with additional safety
|
file |
diff |
annotate
|
| Wed, 19 Nov 2014 11:44:00 -0800 |
Martin von Zweigbergk |
merge: structure 'remote created' code to match table
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 22:07:41 -0800 |
Martin von Zweigbergk |
merge: make calculateupdates() return file->action dict
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 21:58:49 -0800 |
Martin von Zweigbergk |
merge: let _forgetremoved() work on the file->action dict
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 21:06:16 -0800 |
Martin von Zweigbergk |
merge: let _resolvetrivial() work on the file->action dict
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 20:56:53 -0800 |
Martin von Zweigbergk |
merge: let bid merge work on the file->action dict
|
file |
diff |
annotate
|
| Mon, 08 Dec 2014 13:24:10 -0800 |
Martin von Zweigbergk |
merge: write manifestmerge() using dictionary with entry per file
|
file |
diff |
annotate
|
| Fri, 14 Nov 2014 05:53:04 -0800 |
Martin von Zweigbergk |
merge: perform case-collision checking on final set of actions
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 21:21:21 -0800 |
Martin von Zweigbergk |
merge: move cd/dc prompts after largefiles prompts
|
file |
diff |
annotate
|
| Wed, 03 Dec 2014 13:50:28 -0800 |
Martin von Zweigbergk |
merge: extract _resolvetrivial() function
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 16:49:55 -0800 |
Martin von Zweigbergk |
merge: don't treat 'diverge' and 'renamedelete' like actions
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 14:18:31 -0800 |
Martin von Zweigbergk |
merge: move dr/rd warning messages out of applyupdates()
|
file |
diff |
annotate
|
| Fri, 05 Dec 2014 16:13:26 -0800 |
Martin von Zweigbergk |
merge: don't report progress for dr/rd actions
|
file |
diff |
annotate
|
| Wed, 03 Dec 2014 14:03:20 -0800 |
Martin von Zweigbergk |
merge: make 'keep' message more descriptive
|
file |
diff |
annotate
|
| Fri, 05 Dec 2014 12:10:56 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Wed, 03 Dec 2014 11:02:52 -0800 |
Martin von Zweigbergk |
merge: don't overwrite conflicting file in locally renamed directory
|
file |
diff |
annotate
|
| Wed, 03 Dec 2014 10:56:07 -0800 |
Martin von Zweigbergk |
merge: don't ignore conflicting file in remote renamed directory
|
file |
diff |
annotate
|
| Sun, 23 Nov 2014 15:08:50 -0800 |
Martin von Zweigbergk |
merge: duplicate 'if f in copied' into each branch
|
file |
diff |
annotate
|
| Sun, 23 Nov 2014 14:09:10 -0800 |
Martin von Zweigbergk |
merge: branch code into {n1 and n2, n1, n2} top-level cases
|
file |
diff |
annotate
|
| Sun, 16 Nov 2014 23:41:44 -0800 |
Martin von Zweigbergk |
update: don't overwrite untracked ignored files on update
stable
|
file |
diff |
annotate
|
| Wed, 26 Nov 2014 10:25:27 -0800 |
Martin von Zweigbergk |
merge: display modify/delete conflict prompts in sorted order
|
file |
diff |
annotate
|
| Mon, 01 Dec 2014 19:34:11 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Wed, 26 Nov 2014 15:37:01 -0800 |
Pierre-Yves David |
manifest: document the extra letter in working copy manifest node
|
file |
diff |
annotate
|
| Sun, 30 Nov 2014 19:26:53 +0100 |
Mads Kiilerich |
merge: 0 is a valid ancestor different from None
|
file |
diff |
annotate
|
| Mon, 24 Nov 2014 16:17:02 -0800 |
Martin von Zweigbergk |
merge: use None as filename for base in 'both created' conflicts
|
file |
diff |
annotate
|
| Mon, 24 Nov 2014 16:42:36 -0800 |
Martin von Zweigbergk |
merge: break out "both renamed a -> b" case
|
file |
diff |
annotate
|
| Mon, 24 Nov 2014 16:16:34 -0800 |
Martin von Zweigbergk |
merge: separate out "both created" cases
|
file |
diff |
annotate
|
| Mon, 24 Nov 2014 16:11:22 -0800 |
Martin von Zweigbergk |
merge: indent to prepare for next patch
|
file |
diff |
annotate
|
| Mon, 24 Nov 2014 09:50:27 -0800 |
Martin von Zweigbergk |
merge: remove obsolete check for untracked files in 'dm' action
|
file |
diff |
annotate
|
| Sun, 23 Nov 2014 23:10:34 -0800 |
Martin von Zweigbergk |
merge: remove dead assignment in applyupdates()
|
file |
diff |
annotate
|
| Fri, 21 Nov 2014 13:06:04 -0800 |
Martin von Zweigbergk |
merge: move calculateupdates() before applyupdated()
|
file |
diff |
annotate
|
| Mon, 24 Nov 2014 11:28:46 -0800 |
Martin von Zweigbergk |
merge: remove unused variables from _checkcollision()
|
file |
diff |
annotate
|
| Thu, 20 Nov 2014 16:39:32 -0800 |
Martin von Zweigbergk |
merge: consistently use single quotes for non-user-facing strings
|
file |
diff |
annotate
|
| Wed, 19 Nov 2014 08:50:08 -0800 |
Martin von Zweigbergk |
merge: remove confusing comment about --force
|
file |
diff |
annotate
|
| Tue, 18 Nov 2014 16:14:32 -0800 |
Martin von Zweigbergk |
update: remove unnecessary check for unknown files with --check
|
file |
diff |
annotate
|
| Fri, 14 Nov 2014 09:33:28 -0800 |
Martin von Zweigbergk |
manifestmerge: use already existing fl2 synonym for m2.flags(f)
|
file |
diff |
annotate
|
| Thu, 13 Nov 2014 23:12:15 -0800 |
Martin von Zweigbergk |
merge: drop underscore prefix from _checkunknown()
|
file |
diff |
annotate
|
| Tue, 14 Oct 2014 23:18:07 -0700 |
Martin von Zweigbergk |
manifest: transpose pair of pairs from diff()
|
file |
diff |
annotate
|
| Tue, 14 Oct 2014 22:48:44 -0700 |
Martin von Zweigbergk |
manifest: for diff(), only iterate over files, not flags
|
file |
diff |
annotate
|
| Tue, 14 Oct 2014 17:09:16 -0700 |
Martin von Zweigbergk |
manifest: repurpose flagsdiff() into (node-and-flag)diff()
|
file |
diff |
annotate
|
| Mon, 13 Oct 2014 17:12:12 -0500 |
Matt Mackall |
merge: add merge.graft helper
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 14:16:53 -0700 |
Martin von Zweigbergk |
merge: make error message consistent with other commands
|
file |
diff |
annotate
|
| Tue, 07 Oct 2014 00:41:58 -0700 |
Pierre-Yves David |
merge.update: use `first` instead of direct indexing
|
file |
diff |
annotate
|
| 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
|