[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files
From: |
Juri Linkov |
Subject: |
bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files |
Date: |
Tue, 15 Oct 2024 19:13:32 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu) |
>> All right, the attached seems to support both creation and deletion,
>> including applying hunks in reverse direction.
>> Things got trickier but not by a lot.
>
> Now pushed to master, seems useful enough. Let's see if some unforeseen
> problems are reported.
This change broke diff of files:
@@ -1957,7 +1970,7 @@ diff-find-source-location
diff-context-mid-hunk-header-re nil t)
(error "Can't find the hunk separator"))
(match-string 1)))))
- (file (or (diff-find-file-name other noprompt)
+ (file (or (diff-find-file-name (xor other reverse) noprompt)
(error "Can't find the file")))
(revision (and other diff-vc-backend
(if reverse (nth 1 diff-vc-revisions)
So after 'dired-backup-diff', typing 'C-c C-c' visits wrong file:
visits the backup when point is on the file line, and vice versa:
visits the file when point is on backup file line.
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Dmitry Gutov, 2024/10/01
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Eli Zaretskii, 2024/10/02
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Dmitry Gutov, 2024/10/02
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Eli Zaretskii, 2024/10/02
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Dmitry Gutov, 2024/10/02
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Eli Zaretskii, 2024/10/03
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Dmitry Gutov, 2024/10/03
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Dmitry Gutov, 2024/10/07
- Message not available
- Message not available
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files,
Juri Linkov <=
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Dmitry Gutov, 2024/10/16
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Juri Linkov, 2024/10/17
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Dmitry Gutov, 2024/10/18
- bug#62731: 29.0.60; diff-apply-hunk doesn't work for creating new files, Juri Linkov, 2024/10/19