Tue, 17 Nov 2015 15:43:21 -0800 |
Siddharth Agarwal |
test-resolve.t: switch to mergestate.read()
|
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()
|