| Tue, 17 Nov 2015 13:58:50 -0800 |
Siddharth Agarwal |
localrepo.commit: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:57:38 -0800 |
Siddharth Agarwal |
fileset: switch to mergestate.read()
|
| 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()
|
| Tue, 17 Nov 2015 13:56:10 -0800 |
Siddharth Agarwal |
shelve: switch to mergestate.read()
|
| Tue, 17 Nov 2015 13:55:30 -0800 |
Siddharth Agarwal |
mergestate: add a constructor that reads state from disk
|
| Tue, 17 Nov 2015 17:04:53 -0800 |
Siddharth Agarwal |
merge.applyupdates: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:04:32 -0800 |
Siddharth Agarwal |
localrepo: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:02:35 -0800 |
Siddharth Agarwal |
strip: switch to mergestate.clean()
|
| Tue, 17 Nov 2015 17:00:54 -0800 |
Siddharth Agarwal |
mergestate: add a constructor that sets up a clean merge state
|
| Tue, 17 Nov 2015 14:11:52 -0800 |
Siddharth Agarwal |
mergestate: raise structured exception for unsupported merge records
|
| Tue, 17 Nov 2015 14:10:12 -0800 |
Siddharth Agarwal |
error: add a structured exception for unsupported merge records
|
| Tue, 17 Nov 2015 13:47:16 -0800 |
Bryan O'Sullivan |
dirstate: back out 502b56a9e897
|
| Tue, 17 Nov 2015 13:47:14 -0800 |
Bryan O'Sullivan |
osutil: make statfiles check for interrupts periodically
|
