allow for a in-progress rebase

[?]
Jul 27, 2017, 2:47 AM
XNOREIWZWNEKCFWQIZ4734OBVMFICTZZTRBBPGRP5ZTA2Y6PQ3HQC

Dependencies

Change contents

  • replacement in vc-darcs.el at line 227
    [2.1442][2.1442:1553]()
    (let ((file2 (expand-file-name (match-string 0) root)))
    (when (equal file2 file)
    [2.1442]
    [2.1553]
    (let* ((line (match-string 0))
    (file2 (expand-file-name line root)))
    (when (or
    (equal file2 file)
    (equal line "darcs: can't mix match and pending flags"))
  • edit in vc-darcs.el at line 527
    [2.4434]
    [2.4434]
    (if (looking-at "^Rebase in progress:")
    (forward-line 1))