Show More
@@ -522,6 +522,24 b' class mergestate(object):' | |||||
522 | branchmerge = self._repo.dirstate.p2() != nullid |
|
522 | branchmerge = self._repo.dirstate.p2() != nullid | |
523 | recordupdates(self._repo, self.actions(), branchmerge) |
|
523 | recordupdates(self._repo, self.actions(), branchmerge) | |
524 |
|
524 | |||
|
525 | def queueremove(self, f): | |||
|
526 | """queues a file to be removed from the dirstate | |||
|
527 | ||||
|
528 | Meant for use by custom merge drivers.""" | |||
|
529 | self._results[f] = 0, 'r' | |||
|
530 | ||||
|
531 | def queueadd(self, f): | |||
|
532 | """queues a file to be added to the dirstate | |||
|
533 | ||||
|
534 | Meant for use by custom merge drivers.""" | |||
|
535 | self._results[f] = 0, 'a' | |||
|
536 | ||||
|
537 | def queueget(self, f): | |||
|
538 | """queues a file to be marked modified in the dirstate | |||
|
539 | ||||
|
540 | Meant for use by custom merge drivers.""" | |||
|
541 | self._results[f] = 0, 'g' | |||
|
542 | ||||
525 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
|
543 | def _checkunknownfile(repo, wctx, mctx, f, f2=None): | |
526 | if f2 is None: |
|
544 | if f2 is None: | |
527 | f2 = f |
|
545 | f2 = f |
General Comments 0
You need to be logged in to leave comments.
Login now