equal
deleted
inserted
replaced
2356 # amend should abort if commitsubrepos is enabled |
2356 # amend should abort if commitsubrepos is enabled |
2357 assert not commitsubs |
2357 assert not commitsubs |
2358 if subs: |
2358 if subs: |
2359 subrepoutil.writestate(repo, newsubstate) |
2359 subrepoutil.writestate(repo, newsubstate) |
2360 |
2360 |
2361 # avoid cycle (TODO: should be removed in default branch) |
|
2362 from . import merge as mergemod |
|
2363 ms = mergemod.mergestate.read(repo) |
2361 ms = mergemod.mergestate.read(repo) |
2364 mergeutil.checkunresolved(ms) |
2362 mergeutil.checkunresolved(ms) |
2365 |
2363 |
2366 filestoamend = set(f for f in wctx.files() if matcher(f)) |
2364 filestoamend = set(f for f in wctx.files() if matcher(f)) |
2367 |
2365 |