diff options
| author | Sean Whitton | 2025-09-27 21:31:38 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-09-27 21:31:38 +0100 |
| commit | 1d03eb590ca8bbc7d4a0d9432a8eb17d968614a3 (patch) | |
| tree | 7565e332a233dc09b60a375fd09f44e99d8340ba | |
| parent | 50ab62ad75f939edd72a0aef7262f3f19ebb96dc (diff) | |
| download | emacs-1d03eb590ca8bbc7d4a0d9432a8eb17d968614a3.tar.gz emacs-1d03eb590ca8bbc7d4a0d9432a8eb17d968614a3.zip | |
vc-test--checkin-patch: Restore alternative revert code path
* test/lisp/vc/vc-tests/vc-tests.el (vc-test--checkin-patch):
For the last stage of the test, restore alternative code path
for Git, though this time limited to when running the test on
MS-Windows. Cf. subthread starting from
<https://lists.gnu.org/archive/html/emacs-devel/2025-09/msg00785.html>.
| -rw-r--r-- | test/lisp/vc/vc-tests/vc-tests.el | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/test/lisp/vc/vc-tests/vc-tests.el b/test/lisp/vc/vc-tests/vc-tests.el index 38c659950c2..1625c3501db 100644 --- a/test/lisp/vc/vc-tests/vc-tests.el +++ b/test/lisp/vc/vc-tests/vc-tests.el | |||
| @@ -881,7 +881,15 @@ This checks also `vc-backend' and `vc-responsible-backend'." | |||
| 881 | ;; Should take the author, date but not the comment from | 881 | ;; Should take the author, date but not the comment from |
| 882 | ;; PATCH-STRING. | 882 | ;; PATCH-STRING. |
| 883 | (let ((patch-string (get-patch-string))) | 883 | (let ((patch-string (get-patch-string))) |
| 884 | (revert "Revert modification, second time") | 884 | ;; FIXME: Why doesn't `revert' work properly here? |
| 885 | (if (and (eq backend 'Git) | ||
| 886 | (eq system-type 'windows-nt)) | ||
| 887 | (with-current-buffer buf | ||
| 888 | (vc-checkin (list file) backend) | ||
| 889 | (insert "Revert modification, second time") | ||
| 890 | (let (vc-async-checkin) | ||
| 891 | (log-edit-done))) | ||
| 892 | (revert "Revert modification, second time")) | ||
| 885 | (vc-call-backend backend 'checkin-patch patch-string desc2)) | 893 | (vc-call-backend backend 'checkin-patch patch-string desc2)) |
| 886 | (check author date desc2)) | 894 | (check author date desc2)) |
| 887 | 895 | ||