| Sun, 15 Nov 2015 21:27:22 -0800 |
Siddharth Agarwal |
resolve: record dirstate actions after performing resolutions
|
| Wed, 18 Nov 2015 23:43:18 -0800 |
Siddharth Agarwal |
resolve: fix incorrect merge
|
| Wed, 18 Nov 2015 20:59:17 -0600 |
Matt Mackall |
merge with stable
|
| Tue, 17 Nov 2015 14:22:30 -0800 |
Siddharth Agarwal |
debugmergestate: explain why we create mergestate objects directly
|
| Wed, 11 Nov 2015 13:28:00 -0800 |
Christian Delahousse |
debugdirstate: convert keyword parameters to **opts
|
| Tue, 17 Nov 2015 14:20:55 -0800 |
Siddharth Agarwal |
commands.summary: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:56:46 -0800 |
Siddharth Agarwal |
commands.resolve: switch to mergestate.read()
|
| Fri, 13 Nov 2015 23:01:36 -0800 |
Siddharth Agarwal |
debugmergestate: print out record type for files
|
| Sun, 15 Nov 2015 22:58:28 +0100 |
liscju |
pull: return 255 value on update failure (issue4948) (BC)
|
| Fri, 13 Nov 2015 15:56:02 -0800 |
Siddharth Agarwal |
resolve: restore .orig only after merge is fully complete (issue4952)
stable
|
| Tue, 10 Nov 2015 14:26:19 -0800 |
Christian Delahousse |
resolve: choose where .orig file locations are kept
|
| Tue, 10 Nov 2015 17:16:59 -0800 |
Siddharth Agarwal |
resolve: don't abort when file is missing
|
| Sat, 07 Nov 2015 16:03:09 -0500 |
Pierre-Yves David |
unbundle: gratuitous fix white spacing "issue"
|
| Fri, 23 Oct 2015 11:04:53 -0400 |
Augie Fackler |
debugrevlog: cope with empty revlog files
stable
|
| Tue, 20 Oct 2015 18:46:00 -0400 |
timeless |
commands: fix help for debugobsolete
stable
|
| Mon, 19 Oct 2015 15:47:40 -0700 |
Sean Farley |
pull: all pass along extra opargs
|
| Mon, 19 Oct 2015 15:43:35 -0700 |
Sean Farley |
push: all pass along opargs
|
| Tue, 20 Oct 2015 15:56:22 +0200 |
Pierre-Yves David |
unbundle: use 'url' argument with applybundle
|
| Tue, 20 Oct 2015 15:53:07 +0200 |
Pierre-Yves David |
unbundle: use 'source' argument with applybundle
|
| Tue, 20 Oct 2015 15:47:20 +0200 |
Pierre-Yves David |
unbundle: use 'bundle2.applybundle'
|
| Thu, 15 Oct 2015 01:31:04 -0700 |
Siddharth Agarwal |
commands.resolve: conclude merge driver if no unresolved files are left
|
| Thu, 15 Oct 2015 01:27:06 -0700 |
Siddharth Agarwal |
commands.resolve: call driverpreprocess if we haven't run it yet
|
| Thu, 15 Oct 2015 01:15:22 -0700 |
Siddharth Agarwal |
commands.resolve: don't allow users to mark or unmark driver-resolved files
|
| Thu, 15 Oct 2015 01:11:50 -0700 |
Siddharth Agarwal |
resolve: only create wctx once
|
| Thu, 15 Oct 2015 01:09:58 -0700 |
Siddharth Agarwal |
commands.resolve: print out warning when only driver-resolved files remain
|
| Thu, 15 Oct 2015 00:45:20 -0700 |
Siddharth Agarwal |
commands.resolve: support printing out driver-resolved files
|
| Wed, 14 Oct 2015 17:00:34 -0700 |
Gregory Szorc |
exchange: support parameters in bundle specification strings
|
| Thu, 15 Oct 2015 13:43:18 -0700 |
Gregory Szorc |
commands: support consuming stream clone bundles
|
| Sat, 17 Oct 2015 11:40:29 -0700 |
Gregory Szorc |
commands: support creating stream clone bundles
|
| Thu, 15 Oct 2015 01:19:32 +0100 |
Pierre-Yves David |
merge: directly get destination from destutil
|
