| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
rebase: do not bail on uncomitted changes if rebasing in-memory
|
| Thu, 07 Dec 2017 13:25:23 -0800 |
Phil Cohen |
rebase: add the --inmemory option flag; assign a wctx object for the rebase
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
overlayworkingctx: move _wrappedctx out of the constructor
|
| Thu, 07 Dec 2017 13:20:47 -0800 |
Phil Cohen |
merge: don't check for unknown files in IMM
|
| Fri, 13 Oct 2017 14:08:14 -0700 |
Jun Wu |
rebase: enable multidest by default
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
overlayworkingctx: make clean() public
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
overlayworkingctx: remove flushall()
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: skip subrepo state, update hooks, and updating the dirstate in IMM
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
merge: remove calls to flushall()
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
context: switch ctx() use to changectx()
|
| Wed, 06 Dec 2017 22:56:15 -0500 |
Matt Harbison |
lfs: introduce a user level cache for lfs files
|
| Tue, 05 Dec 2017 23:08:59 -0500 |
Matt Harbison |
largefiles: refactor _usercachedir() to allow reuse with lfs
|
