From ccee1c0de6eb283482ab6fbcdff6043863edfa82 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 5 Feb 2026 11:46:01 +0000 Subject: [PATCH] ; Improve outgoing base command docstrings. --- lisp/vc/vc.el | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 14da03cda1d..3d85453a3b3 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -3347,7 +3347,9 @@ Uncommitted changes are included in the diff. When unspecified, UPSTREAM-LOCATION is the outgoing base. For a trunk branch this is always the place \\[vc-push] would push to. -For a topic branch, query the backend for an appropriate outgoing base. +For a topic branch, see whether the branch matches one of +`vc-trunk-branch-regexps' or `vc-topic-branch-regexps', or else query +the backend for an appropriate outgoing base. See `vc-trunk-branch-regexps' and `vc-topic-branch-regexps' regarding the difference between trunk and topic branches. @@ -3375,7 +3377,9 @@ Uncommitted changes are included in the diff. When unspecified, UPSTREAM-LOCATION is the outgoing base. For a trunk branch this is always the place \\[vc-push] would push to. -For a topic branch, query the backend for an appropriate outgoing base. +For a topic branch, see whether the branch matches one of +`vc-trunk-branch-regexps' or `vc-topic-branch-regexps', or else query +the backend for an appropriate outgoing base. See `vc-trunk-branch-regexps' and `vc-topic-branch-regexps' regarding the difference between trunk and topic branches. @@ -3409,7 +3413,9 @@ working revision and UPSTREAM-LOCATION. When unspecified, UPSTREAM-LOCATION is the outgoing base. For a trunk branch this is always the place \\[vc-push] would push to. -For a topic branch, query the backend for an appropriate outgoing base. +For a topic branch, see whether the branch matches one of +`vc-trunk-branch-regexps' or `vc-topic-branch-regexps', or else query +the backend for an appropriate outgoing base. See `vc-trunk-branch-regexps' and `vc-topic-branch-regexps' regarding the difference between trunk and topic branches. @@ -3441,7 +3447,9 @@ working revision and UPSTREAM-LOCATION. When unspecified, UPSTREAM-LOCATION is the outgoing base. For a trunk branch this is always the place \\[vc-push] would push to. -For a topic branch, query the backend for an appropriate outgoing base. +For a topic branch, see whether the branch matches one of +`vc-trunk-branch-regexps' or `vc-topic-branch-regexps', or else query +the backend for an appropriate outgoing base. See `vc-trunk-branch-regexps' and `vc-topic-branch-regexps' regarding the difference between trunk and topic branches.