Show More
@@ -230,8 +230,8 b' def _matcheol(file, origfile):' | |||||
230 |
|
230 | |||
231 | @internaltool('prompt', nomerge) |
|
231 | @internaltool('prompt', nomerge) | |
232 | def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf): |
|
232 | def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf): | |
233 |
"""Asks the user which of the local or the other version to keep |
|
233 | """Asks the user which of the local (p1) or the other (p2) version to keep | |
234 | the merged version.""" |
|
234 | as the merged version.""" | |
235 | ui = repo.ui |
|
235 | ui = repo.ui | |
236 | fd = fcd.path() |
|
236 | fd = fcd.path() | |
237 |
|
237 | |||
@@ -268,12 +268,12 b' def _iprompt(repo, mynode, orig, fcd, fc' | |||||
268 |
|
268 | |||
269 | @internaltool('local', nomerge) |
|
269 | @internaltool('local', nomerge) | |
270 | def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): |
|
270 | def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf): | |
271 | """Uses the local version of files as the merged version.""" |
|
271 | """Uses the local (p1) version of files as the merged version.""" | |
272 | return 0, fcd.isabsent() |
|
272 | return 0, fcd.isabsent() | |
273 |
|
273 | |||
274 | @internaltool('other', nomerge) |
|
274 | @internaltool('other', nomerge) | |
275 | def _iother(repo, mynode, orig, fcd, fco, fca, toolconf): |
|
275 | def _iother(repo, mynode, orig, fcd, fco, fca, toolconf): | |
276 | """Uses the other version of files as the merged version.""" |
|
276 | """Uses the other (p2) version of files as the merged version.""" | |
277 | if fco.isabsent(): |
|
277 | if fco.isabsent(): | |
278 | # local changed, remote deleted -- 'deleted' picked |
|
278 | # local changed, remote deleted -- 'deleted' picked | |
279 | repo.wvfs.unlinkpath(fcd.path()) |
|
279 | repo.wvfs.unlinkpath(fcd.path()) | |
@@ -411,7 +411,7 b' def _imergeauto(repo, mynode, orig, fcd,' | |||||
411 | def _imergelocal(*args, **kwargs): |
|
411 | def _imergelocal(*args, **kwargs): | |
412 | """ |
|
412 | """ | |
413 | Like :merge, but resolve all conflicts non-interactively in favor |
|
413 | Like :merge, but resolve all conflicts non-interactively in favor | |
414 | of the local changes.""" |
|
414 | of the local (p1) changes.""" | |
415 | success, status = _imergeauto(localorother='local', *args, **kwargs) |
|
415 | success, status = _imergeauto(localorother='local', *args, **kwargs) | |
416 | return success, status, False |
|
416 | return success, status, False | |
417 |
|
417 | |||
@@ -419,7 +419,7 b' def _imergelocal(*args, **kwargs):' | |||||
419 | def _imergeother(*args, **kwargs): |
|
419 | def _imergeother(*args, **kwargs): | |
420 | """ |
|
420 | """ | |
421 | Like :merge, but resolve all conflicts non-interactively in favor |
|
421 | Like :merge, but resolve all conflicts non-interactively in favor | |
422 | of the other changes.""" |
|
422 | of the other (p2) changes.""" | |
423 | success, status = _imergeauto(localorother='other', *args, **kwargs) |
|
423 | success, status = _imergeauto(localorother='other', *args, **kwargs) | |
424 | return success, status, False |
|
424 | return success, status, False | |
425 |
|
425 |
@@ -1539,7 +1539,7 b' Test dynamic list of merge tools only sh' | |||||
1539 | to resolve these conflicts. |
|
1539 | to resolve these conflicts. | |
1540 |
|
1540 | |||
1541 | ":local" |
|
1541 | ":local" | |
1542 | Uses the local version of files as the merged version. |
|
1542 | Uses the local (p1) version of files as the merged version. | |
1543 |
|
1543 | |||
1544 | ":merge" |
|
1544 | ":merge" | |
1545 | Uses the internal non-interactive simple merge algorithm for merging |
|
1545 | Uses the internal non-interactive simple merge algorithm for merging | |
@@ -1549,11 +1549,11 b' Test dynamic list of merge tools only sh' | |||||
1549 |
|
1549 | |||
1550 | ":merge-local" |
|
1550 | ":merge-local" | |
1551 | Like :merge, but resolve all conflicts non-interactively in favor of the |
|
1551 | Like :merge, but resolve all conflicts non-interactively in favor of the | |
1552 | local changes. |
|
1552 | local (p1) changes. | |
1553 |
|
1553 | |||
1554 | ":merge-other" |
|
1554 | ":merge-other" | |
1555 | Like :merge, but resolve all conflicts non-interactively in favor of the |
|
1555 | Like :merge, but resolve all conflicts non-interactively in favor of the | |
1556 | other changes. |
|
1556 | other (p2) changes. | |
1557 |
|
1557 | |||
1558 | ":merge3" |
|
1558 | ":merge3" | |
1559 | Uses the internal non-interactive simple merge algorithm for merging |
|
1559 | Uses the internal non-interactive simple merge algorithm for merging | |
@@ -1562,11 +1562,11 b' Test dynamic list of merge tools only sh' | |||||
1562 | side of the merge and one for the base content. |
|
1562 | side of the merge and one for the base content. | |
1563 |
|
1563 | |||
1564 | ":other" |
|
1564 | ":other" | |
1565 | Uses the other version of files as the merged version. |
|
1565 | Uses the other (p2) version of files as the merged version. | |
1566 |
|
1566 | |||
1567 | ":prompt" |
|
1567 | ":prompt" | |
1568 |
Asks the user which of the local or the other version to keep |
|
1568 | Asks the user which of the local (p1) or the other (p2) version to keep | |
1569 | merged version. |
|
1569 | as the merged version. | |
1570 |
|
1570 | |||
1571 | ":tagmerge" |
|
1571 | ":tagmerge" | |
1572 | Uses the internal tag merge algorithm (experimental). |
|
1572 | Uses the internal tag merge algorithm (experimental). |
General Comments 0
You need to be logged in to leave comments.
Login now