| Fri, 13 Nov 2015 22:43:09 -0800 |
Siddharth Agarwal |
merge: make 'cd' and 'dc' actions store the same arguments as 'm'
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 14:24:22 -0800 |
Siddharth Agarwal |
merge: stop emptying out 'cd' and 'dc' actions
|
file |
diff |
annotate
|
| Thu, 12 Nov 2015 13:14:03 -0800 |
Martin von Zweigbergk |
merge: move messages about possible conflicts a litte earlier
|
file |
diff |
annotate
|
| Thu, 12 Nov 2015 14:29:02 -0800 |
Siddharth Agarwal |
merge.applyupdates: only attempt to merge files in mergeactions
|
file |
diff |
annotate
|
| Wed, 04 Nov 2015 23:44:51 -0800 |
Siddharth Agarwal |
merge.mergestate: update docstrings for preresolve and resolve
|
file |
diff |
annotate
|
| Fri, 23 Oct 2015 06:06:22 -0400 |
Augie Fackler |
merge: improve clarity of table in update docstring
stable
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:22:01 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverconclude after performing merge actions
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:19:10 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverpreprocess before starting merge actions
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:17:29 -0700 |
Siddharth Agarwal |
merge: add stubs for preprocess and conclude steps of merge driver
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:06:29 -0700 |
Siddharth Agarwal |
merge.mergestate: set merge driver state to 's' if there's none present
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:04:46 -0700 |
Siddharth Agarwal |
merge.mergestate: only check for merge driver when property is accessed
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 00:57:56 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the merge driver state
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 00:49:07 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the other side of the merge
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
merge: make in-memory changes visible to external update hooks
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: make dirstate.write() callers pass transaction object to it
|
file |
diff |
annotate
|
| Wed, 14 Oct 2015 15:01:07 -0700 |
Siddharth Agarwal |
merge.mergestate: add a generator for driver-resolved files
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 21:42:09 -0700 |
Pierre-Yves David |
update: "deprecate" call to 'merge.update' without a destination
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 00:16:25 +0200 |
Mads Kiilerich |
merge: abort on file/directory case folding collisions (issue4892)
|
file |
diff |
annotate
|
| Wed, 30 Sep 2015 19:43:51 -0700 |
Siddharth Agarwal |
merge.mergedriver: don't try resolving files marked driver-resolved
|
file |
diff |
annotate
|
| Mon, 28 Sep 2015 18:34:06 -0700 |
Siddharth Agarwal |
merge.mergestate: add support for persisting driver-resolved files
|
file |
diff |
annotate
|
| Wed, 30 Sep 2015 21:42:52 -0700 |
Siddharth Agarwal |
merge.mergestate: add support for persisting a custom merge driver
|
file |
diff |
annotate
|
| Tue, 29 Sep 2015 01:03:26 -0700 |
Pierre-Yves David |
destupdate: also include bookmark related logic
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 21:56:39 -0700 |
Siddharth Agarwal |
merge.mergestate: perform all premerges before any merges (BC)
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:12:12 -0700 |
Siddharth Agarwal |
merge: introduce a preresolve function
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 18:37:54 -0700 |
Siddharth Agarwal |
merge.mergestate._resolve: also return completed status
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 18:29:50 -0700 |
Siddharth Agarwal |
merge.mergestate: add a wrapper around resolve
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:47:14 -0700 |
Siddharth Agarwal |
filemerge: break overall filemerge into separate premerge and merge steps
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 12:56:21 -0700 |
Siddharth Agarwal |
filemerge: also return whether the merge is complete
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 12:55:45 -0700 |
Pierre-Yves David |
error: get Abort from 'error' instead of 'util'
|
file |
diff |
annotate
|
| Mon, 28 Sep 2015 22:11:23 -0700 |
Pierre-Yves David |
merge: get the default update destination from the function
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 01:47:33 -0700 |
Pierre-Yves David |
merge: drop special parent assignment in the obsolete case
|
file |
diff |
annotate
|
| Wed, 30 Sep 2015 21:22:31 -0700 |
Siddharth Agarwal |
merge.mergestate: factor out code to validate v1/v2 records
|
file |
diff |
annotate
|
| Fri, 25 Sep 2015 00:54:20 -0400 |
timeless |
merge: fix mergestate comment
|
file |
diff |
annotate
|
| 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
|