Show More
@@ -1424,14 +1424,13 b' def calculateupdates(repo, wctx, mctx, a' | |||
|
1424 | 1424 | del actions[f] |
|
1425 | 1425 | repo.ui.note(_('end of auction\n\n')) |
|
1426 | 1426 | |
|
1427 | _resolvetrivial(repo, wctx, mctx, ancestors[0], actions) | |
|
1428 | ||
|
1429 | 1427 | if wctx.rev() is None: |
|
1430 | 1428 | fractions = _forgetremoved(wctx, mctx, branchmerge) |
|
1431 | 1429 | actions.update(fractions) |
|
1432 | 1430 | |
|
1433 | 1431 | prunedactions = sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, |
|
1434 | 1432 | actions) |
|
1433 | _resolvetrivial(repo, wctx, mctx, ancestors[0], actions) | |
|
1435 | 1434 | |
|
1436 | 1435 | return prunedactions, diverge, renamedelete |
|
1437 | 1436 |
@@ -112,5 +112,9 b' file is excluded from sparse checkout' | |||
|
112 | 112 | a |
|
113 | 113 | |
|
114 | 114 | $ hg merge |
|
115 | abort: $ENOENT$: '$TESTTMP/ytest/d' | |
|
116 | [255] | |
|
115 | temporarily included 1 file(s) in the sparse checkout for merging | |
|
116 | local [working copy] changed d which other [merge rev] deleted | |
|
117 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
|
118 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
119 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
|
120 | [1] |
General Comments 0
You need to be logged in to leave comments.
Login now