diff options
| author | Sean Whitton | 2025-08-12 20:26:18 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-08-12 20:27:09 +0100 |
| commit | e48592ef3bc0734bcc4655cc3863f35a30e14437 (patch) | |
| tree | 9e66f14312a57ca4198613eb531d9a2a05c4864d | |
| parent | 56bfd63bb8dd73d3cd552f3a663bd7e9c33f3ab9 (diff) | |
| download | emacs-e48592ef3bc0734bcc4655cc3863f35a30e14437.tar.gz emacs-e48592ef3bc0734bcc4655cc3863f35a30e14437.zip | |
* lisp/vc/vc-hg.el (vc-hg-checkin): Pass '-A' to 'hg commit'.
| -rw-r--r-- | lisp/vc/vc-hg.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index b39a8c6928a..5bb826d555f 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el | |||
| @@ -1216,7 +1216,7 @@ It is based on `log-edit-mode', and has Hg-specific extensions.") | |||
| 1216 | (defun vc-hg-checkin (files comment &optional _rev) | 1216 | (defun vc-hg-checkin (files comment &optional _rev) |
| 1217 | "Hg-specific version of `vc-BACKEND-checkin'. | 1217 | "Hg-specific version of `vc-BACKEND-checkin'. |
| 1218 | REV is ignored." | 1218 | REV is ignored." |
| 1219 | (let ((args (nconc (list "commit" "-m") | 1219 | (let ((args (nconc (list "commit" "-A" "-m") |
| 1220 | (vc-hg--extract-headers comment)))) | 1220 | (vc-hg--extract-headers comment)))) |
| 1221 | (if vc-async-checkin | 1221 | (if vc-async-checkin |
| 1222 | (let ((buffer (vc-hg--async-buffer))) | 1222 | (let ((buffer (vc-hg--async-buffer))) |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 135762fc806..f2972f10e6a 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -1604,7 +1604,7 @@ from which to check out the file(s)." | |||
| 1604 | ;; If committing a mix of removed and edited files, the | 1604 | ;; If committing a mix of removed and edited files, the |
| 1605 | ;; fileset has state = 'edited. Rather than checking the | 1605 | ;; fileset has state = 'edited. Rather than checking the |
| 1606 | ;; state of each individual file in the fileset, it seems | 1606 | ;; state of each individual file in the fileset, it seems |
| 1607 | ;; simplest to just check if the file exists. Bug#9781. | 1607 | ;; simplest to just check if the file exists. Bug#9781. |
| 1608 | (when (and (file-exists-p file) (not (file-writable-p file))) | 1608 | (when (and (file-exists-p file) (not (file-writable-p file))) |
| 1609 | ;; Make the file-buffer read-write. | 1609 | ;; Make the file-buffer read-write. |
| 1610 | (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) | 1610 | (unless (y-or-n-p (format "%s is edited but read-only; make it writable and continue? " file)) |