Tue, 17 Nov 2015 13:56:10 -0800 shelve: switch to mergestate.read()
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 13:56:10 -0800] rev 26992
shelve: switch to mergestate.read() See previous patches for why we're doing this.
Tue, 17 Nov 2015 13:55:30 -0800 mergestate: add a constructor that reads state from disk
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 13:55:30 -0800] rev 26991
mergestate: add a constructor that reads state from disk At the moment it's the same as just creating a new mergestate, but we'll soon move the _read call out of __init__ and in here.
Tue, 17 Nov 2015 17:04:53 -0800 merge.applyupdates: switch to mergestate.clean()
Siddharth Agarwal <sid0@fb.com> [Tue, 17 Nov 2015 17:04:53 -0800] rev 26990
merge.applyupdates: switch to mergestate.clean() See the previous patches for why we're doing this.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip