| Wed, 18 Nov 2015 23:43:18 -0800 |
Siddharth Agarwal |
resolve: fix incorrect merge
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 20:59:17 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 17 Nov 2015 14:22:30 -0800 |
Siddharth Agarwal |
debugmergestate: explain why we create mergestate objects directly
|
file |
diff |
annotate
|
| Wed, 11 Nov 2015 13:28:00 -0800 |
Christian Delahousse |
debugdirstate: convert keyword parameters to **opts
|
file |
diff |
annotate
|
| Tue, 17 Nov 2015 14:20:55 -0800 |
Siddharth Agarwal |
commands.summary: switch to mergestate.read()
|
file |
diff |
annotate
|
| Tue, 17 Nov 2015 13:56:46 -0800 |
Siddharth Agarwal |
commands.resolve: switch to mergestate.read()
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 23:01:36 -0800 |
Siddharth Agarwal |
debugmergestate: print out record type for files
|
file |
diff |
annotate
|
| Sun, 15 Nov 2015 22:58:28 +0100 |
liscju |
pull: return 255 value on update failure (issue4948) (BC)
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 15:56:02 -0800 |
Siddharth Agarwal |
resolve: restore .orig only after merge is fully complete (issue4952)
stable
|
file |
diff |
annotate
|
| Tue, 10 Nov 2015 14:26:19 -0800 |
Christian Delahousse |
resolve: choose where .orig file locations are kept
|
file |
diff |
annotate
|
| Tue, 10 Nov 2015 17:16:59 -0800 |
Siddharth Agarwal |
resolve: don't abort when file is missing
|
file |
diff |
annotate
|
| Sat, 07 Nov 2015 16:03:09 -0500 |
Pierre-Yves David |
unbundle: gratuitous fix white spacing "issue"
|
file |
diff |
annotate
|
| Fri, 23 Oct 2015 11:04:53 -0400 |
Augie Fackler |
debugrevlog: cope with empty revlog files
stable
|
file |
diff |
annotate
|
| Tue, 20 Oct 2015 18:46:00 -0400 |
timeless |
commands: fix help for debugobsolete
stable
|
file |
diff |
annotate
|
| Mon, 19 Oct 2015 15:47:40 -0700 |
Sean Farley |
pull: all pass along extra opargs
|
file |
diff |
annotate
|
| Mon, 19 Oct 2015 15:43:35 -0700 |
Sean Farley |
push: all pass along opargs
|
file |
diff |
annotate
|
| Tue, 20 Oct 2015 15:56:22 +0200 |
Pierre-Yves David |
unbundle: use 'url' argument with applybundle
|
file |
diff |
annotate
|
| Tue, 20 Oct 2015 15:53:07 +0200 |
Pierre-Yves David |
unbundle: use 'source' argument with applybundle
|
file |
diff |
annotate
|
| Tue, 20 Oct 2015 15:47:20 +0200 |
Pierre-Yves David |
unbundle: use 'bundle2.applybundle'
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:31:04 -0700 |
Siddharth Agarwal |
commands.resolve: conclude merge driver if no unresolved files are left
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:27:06 -0700 |
Siddharth Agarwal |
commands.resolve: call driverpreprocess if we haven't run it yet
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:15:22 -0700 |
Siddharth Agarwal |
commands.resolve: don't allow users to mark or unmark driver-resolved files
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:11:50 -0700 |
Siddharth Agarwal |
resolve: only create wctx once
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:09:58 -0700 |
Siddharth Agarwal |
commands.resolve: print out warning when only driver-resolved files remain
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 00:45:20 -0700 |
Siddharth Agarwal |
commands.resolve: support printing out driver-resolved files
|
file |
diff |
annotate
|
| Wed, 14 Oct 2015 17:00:34 -0700 |
Gregory Szorc |
exchange: support parameters in bundle specification strings
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 13:43:18 -0700 |
Gregory Szorc |
commands: support consuming stream clone bundles
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 11:40:29 -0700 |
Gregory Szorc |
commands: support creating stream clone bundles
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:19:32 +0100 |
Pierre-Yves David |
merge: directly get destination from destutil
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 17:12:12 -0400 |
Augie Fackler |
commands: use cg?unpacker.apply() instead of changegroup.addchangegroup()
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 04:26:26 -0700 |
Pierre-Yves David |
update: introduce a 'UpdateAbort' exception
|
file |
diff |
annotate
|
| Wed, 14 Oct 2015 18:03:17 -0500 |
Matt Mackall |
bookmarks: don't deactivate on no-op update (issue4901)
|
file |
diff |
annotate
|
| Wed, 30 Sep 2015 21:48:53 -0700 |
Siddharth Agarwal |
debugmergestate: add support for printing out driver-resolved files
|
file |
diff |
annotate
|
| Wed, 30 Sep 2015 21:47:27 -0700 |
Siddharth Agarwal |
debugmergestate: add support for printing out merge driver
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 21:31:32 -0700 |
Pierre-Yves David |
update: also use 'destupdate' for pull and unbundle
|
file |
diff |
annotate
|
| Tue, 29 Sep 2015 01:03:26 -0700 |
Pierre-Yves David |
destupdate: also include bookmark related logic
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 10:57:54 -0700 |
Gregory Szorc |
exchange: refactor bundle specification parsing
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 11:43:21 -0700 |
Gregory Szorc |
exchange: move bundle specification parsing from cmdutil
|
file |
diff |
annotate
|
| Tue, 29 Sep 2015 00:18:49 -0700 |
Pierre-Yves David |
destupdate: include the 'check' logic
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 03:50:47 -0700 |
Pierre-Yves David |
destupdate: move the check related to the "clean" logic in the function
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 23:58:07 -0700 |
Siddharth Agarwal |
resolve: perform all premerges before performing any file merges (BC)
|
file |
diff |
annotate
|
| Sun, 11 Oct 2015 20:12:12 -0700 |
Siddharth Agarwal |
merge: introduce a preresolve function
|
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
|
| Fri, 09 Oct 2015 03:53:47 +0900 |
FUJIWARA Katsunori |
commands: use dirstateguard instead of begin/end-parentchange for backout
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 03:53:47 +0900 |
FUJIWARA Katsunori |
commands: make "hg import" use dirstateguard only for --no-commit
|
file |
diff |
annotate
|
| Sun, 04 Oct 2015 21:48:19 -0700 |
Pierre-Yves David |
unbundle: properly read head modification result from bundle2
|
file |
diff |
annotate
|
| Thu, 01 Oct 2015 20:31:43 -0700 |
Pierre-Yves David |
bundle: use bundle2 if repository uses general delta
|
file |
diff |
annotate
|
| Thu, 01 Oct 2015 19:16:00 -0700 |
Pierre-Yves David |
bundle: extend the format of --type to support version and compression
|
file |
diff |
annotate
|
| Thu, 01 Oct 2015 18:01:24 -0700 |
Pierre-Yves David |
bundle: extract the parsing of the bundle type in a function
|
file |
diff |
annotate
|
| Fri, 02 Oct 2015 13:00:47 -0700 |
Siddharth Agarwal |
commands: add a new debug command to print merge state
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 07:13:35 +0200 |
Mathias De Maré |
revert: add reference to backout
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 07:11:48 +0200 |
Mathias De Maré |
backout: add reference to revert
|
file |
diff |
annotate
|
| Wed, 30 Sep 2015 15:43:49 -0500 |
Matt Mackall |
urls: bulk-change primary website URLs
|
file |
diff |
annotate
|
| Thu, 24 Sep 2015 17:52:21 -0700 |
Pierre-Yves David |
unbundle: test and fix for clean abort on unknown bundle2 feature
|
file |
diff |
annotate
|
| Fri, 25 Sep 2015 23:10:47 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 25 Sep 2015 13:30:49 -0700 |
Pierre-Yves David |
unbundle: cleanly abort on unknown bundle2 feature
stable
|
file |
diff |
annotate
|
| Mon, 14 Sep 2015 19:25:34 -0400 |
Jordi Gutiérrez Hermoso |
phases: return zero for no-op operations (issue4751) (BC)
|
file |
diff |
annotate
|
| Fri, 25 Sep 2015 11:16:20 -0400 |
Jordi Gutiérrez Hermoso |
dispatch: don't stack trace on commands like `hg .log`
|
file |
diff |
annotate
|
| Fri, 25 Sep 2015 03:51:46 -0400 |
timeless |
resolve: consistently describe re-merge + unresolved
|
file |
diff |
annotate
|
| Thu, 10 Sep 2015 16:53:07 +0200 |
liscju |
mercurial: add debugextensions command (issue4676)
|
file |
diff |
annotate
|