| Thu, 15 Oct 2015 01:31:04 -0700 |
Siddharth Agarwal |
commands.resolve: conclude merge driver if no unresolved files are left
|
changeset |
files
|
| Thu, 15 Oct 2015 01:27:06 -0700 |
Siddharth Agarwal |
commands.resolve: call driverpreprocess if we haven't run it yet
|
changeset |
files
|
| Thu, 15 Oct 2015 01:22:01 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverconclude after performing merge actions
|
changeset |
files
|
| Thu, 15 Oct 2015 01:19:10 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverpreprocess before starting merge actions
|
changeset |
files
|
| Thu, 15 Oct 2015 01:17:29 -0700 |
Siddharth Agarwal |
merge: add stubs for preprocess and conclude steps of merge driver
|
changeset |
files
|
| Thu, 15 Oct 2015 01:15:22 -0700 |
Siddharth Agarwal |
commands.resolve: don't allow users to mark or unmark driver-resolved files
|
changeset |
files
|
| Thu, 15 Oct 2015 01:11:50 -0700 |
Siddharth Agarwal |
resolve: only create wctx once
|
changeset |
files
|
| Mon, 19 Oct 2015 12:07:17 -0700 |
James Mills |
dirstate: fix invalid reference to self.ui
|
changeset |
files
|
| Sat, 17 Oct 2015 00:58:46 +0200 |
Mads Kiilerich |
spelling: trivial spell checking
|
changeset |
files
|
| Wed, 14 Oct 2015 03:30:27 -0400 |
timeless |
mq: consistently use qrefresh
|
changeset |
files
|
| Wed, 14 Oct 2015 02:06:54 -0400 |
timeless |
grammar: use does instead of do where appropriate
|
changeset |
files
|
| Wed, 14 Oct 2015 22:29:03 -0400 |
timeless |
l10n: use %d instead of %s for numbers
|
changeset |
files
|
| Thu, 15 Oct 2015 20:36:12 -0400 |
timeless |
check-code: block non-portable pipe-and
|
changeset |
files
|
| Thu, 15 Oct 2015 20:32:01 -0400 |
timeless |
test-shelve: do not use non-portable pipe-and
|
changeset |
files
|
| Sun, 18 Oct 2015 09:05:04 +0900 |
Yuya Nishihara |
parsers: suppress warning of signed and unsigned comparison at nt_init
|
changeset |
files
|
| Sat, 17 Oct 2015 23:14:13 +0900 |
Yuya Nishihara |
parsers: correct type of temporary variables for dirstate tuple fields
|
changeset |
files
|
| Fri, 16 Oct 2015 02:53:57 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
|
changeset |
files
|
| Fri, 16 Oct 2015 02:51:34 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-format.t'
|
changeset |
files
|
| Sat, 17 Oct 2015 15:48:14 -0700 |
Ryan McElroy |
editmerge: properly quote variables
|
changeset |
files
|
| Thu, 15 Oct 2015 01:09:58 -0700 |
Siddharth Agarwal |
commands.resolve: print out warning when only driver-resolved files remain
|
changeset |
files
|
| Thu, 15 Oct 2015 01:06:29 -0700 |
Siddharth Agarwal |
merge.mergestate: set merge driver state to 's' if there's none present
|
changeset |
files
|
| Thu, 15 Oct 2015 01:04:46 -0700 |
Siddharth Agarwal |
merge.mergestate: only check for merge driver when property is accessed
|
changeset |
files
|
| Thu, 15 Oct 2015 01:02:32 -0700 |
Siddharth Agarwal |
localrepo.commit: abort if merge driver's conclude step hasn't been run yet
|
changeset |
files
|
| Thu, 15 Oct 2015 00:57:56 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the merge driver state
|
changeset |
files
|