diff options
| author | Sean Whitton | 2025-08-30 15:54:32 +0100 |
|---|---|---|
| committer | Sean Whitton | 2025-08-30 15:54:32 +0100 |
| commit | 8a284cbbc588d19d48ffbd159dfa506da468e351 (patch) | |
| tree | 0afd57eed761c60bc4e73dc5897ff21e7bb63920 /doc | |
| parent | af4a5e2b4ad080ad5d3b714286e7aca9339288b0 (diff) | |
| download | emacs-8a284cbbc588d19d48ffbd159dfa506da468e351.tar.gz emacs-8a284cbbc588d19d48ffbd159dfa506da468e351.zip | |
; Fix `(emacs)Merge Bases'
Intended to be included in previous commit.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/vc1-xtra.texi | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index c96f21f0c83..41058aefce5 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi | |||
| @@ -247,20 +247,13 @@ another (@code{vc-log-mergebase}). | |||
| 247 | @c more than one branch for older VCS? This needs thinking through if | 247 | @c more than one branch for older VCS? This needs thinking through if |
| 248 | @c any of our centalized VCS gain support for these commands. | 248 | @c any of our centalized VCS gain support for these commands. |
| 249 | The @dfn{merge base} of two branches is the most recent revision that | 249 | The @dfn{merge base} of two branches is the most recent revision that |
| 250 | exists on both branches. If neither of the branches were ever merged | 250 | exists on both branches. If neither of the branches was ever merged |
| 251 | into the other (@pxref{Merging}), then the merge base is the revision | 251 | into the other (@pxref{Merging}), then the merge base is the revision |
| 252 | that the older of the two branches was at when the newer branch was | 252 | that the older of the two branches was at when the newer branch was |
| 253 | created from it (@pxref{Creating Branches}). If one of the branches was | 253 | created from it (@pxref{Creating Branches}). If one of the branches was |
| 254 | ever merged into the other, then the merge base is the most recent merge | 254 | ever merged into the other, then the merge base is the most recent merge |
| 255 | point. | 255 | point. |
| 256 | 256 | ||
| 257 | With this understood, we can generalize the concept of a merge base from | ||
| 258 | branches to any two revisions. The merge base of two revisions is the | ||
| 259 | most recent revision that can be found in the revision history of both | ||
| 260 | of the two revisions.@footnote{In fact the concept generalizes to any | ||
| 261 | number of revisions, but Emacs's commands for merge bases work with only | ||
| 262 | two, so we limit ourselves to that.} | ||
| 263 | |||
| 264 | The commands described in this section are currently implemented only | 257 | The commands described in this section are currently implemented only |
| 265 | for decentralized version control systems (@pxref{VCS Repositories}). | 258 | for decentralized version control systems (@pxref{VCS Repositories}). |
| 266 | 259 | ||