From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#62940: 29.0.60; vc: no easy way to get diff of all outgoing changes Date: Sat, 12 Oct 2024 11:32:05 +0300 Message-ID: <86v7xxyb5m.fsf@gnu.org> References: <640746f7-fa1c-dfb9-aaab-f9d8effdf64f@gutov.dev> <59c272ef-9909-4e0a-b3d7-b42fc14e54cc@gutov.dev> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="19174"; mail-complaints-to="usenet@ciao.gmane.io" Cc: sbaugh@janestreet.com, 62940@debbugs.gnu.org, fgunbin@fastmail.fm To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Oct 12 10:33:17 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1szXYq-0004oL-0j for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 12 Oct 2024 10:33:16 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1szXYV-0005n0-3N; Sat, 12 Oct 2024 04:32:55 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1szXYP-0005ir-28 for bug-gnu-emacs@gnu.org; Sat, 12 Oct 2024 04:32:49 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1szXYO-0001i0-Ol for bug-gnu-emacs@gnu.org; Sat, 12 Oct 2024 04:32:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:In-Reply-To:From:Date:To:Subject; bh=k1QojtKCvD0kJWThvNSaoQrrkgI2UphU9WSq+rPmYJ8=; b=VZODRxgBEvOl+xGjsSpaNPUaZsVmlWRW0djQ37yKNngGnseBGpfK07UguZ3v6aXhiFhHcZxjUD/TJNGJWlXzoDfcsENuQOMlZhYkuAAv9rFDMvQPBxEg64u7ozzKcnuLNp47HJC+X80TBDGNfifjzxNem7UXY235p9ZQGtQDbxb5cYocKQkiZ5jPhH7zzrYEbLhcncJwgRWJ3BCKRUewkOqOIFd6/T/LGLKNiZRS6RDPFLCy5u3QYsqlgCmkwE2hMFXzIZnvzQH4ITj8G8+GDRTNCQS0xRCJKYpWdflf0rAbm1TUocCDm4uuhAunav2ftVnkhONU1p4ckiU9Xkcmgg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1szXYc-0005U1-7Y for bug-gnu-emacs@gnu.org; Sat, 12 Oct 2024 04:33:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 12 Oct 2024 08:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62940 X-GNU-PR-Package: emacs Original-Received: via spool by 62940-submit@debbugs.gnu.org id=B62940.172872195321036 (code B ref 62940); Sat, 12 Oct 2024 08:33:02 +0000 Original-Received: (at 62940) by debbugs.gnu.org; 12 Oct 2024 08:32:33 +0000 Original-Received: from localhost ([127.0.0.1]:36245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szXY9-0005TD-1U for submit@debbugs.gnu.org; Sat, 12 Oct 2024 04:32:33 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:34790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szXY3-0005Sv-GY for 62940@debbugs.gnu.org; Sat, 12 Oct 2024 04:32:30 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1szXXj-0001gM-VP; Sat, 12 Oct 2024 04:32:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=k1QojtKCvD0kJWThvNSaoQrrkgI2UphU9WSq+rPmYJ8=; b=hpomYfVMtmtD NwbK/dHt5XGo4npHpdRm855RQI4hB3XTfwVAYNYxxjm6sM6DIRc+CgToqEUddzl3sFjiTuX9EDBBO X+j7cd25+qu8wP+pYpqo2XYfyENMOkVG485O2z9CRcd9R5ISMl0+03wnbDPUjNFpHYDgLGuJPJnrG qPY5gbzRx8LfYlB5wlG6zuo+fV5RBKTmeSCSBmxjww+vHoXs9Y4fx2SvGoF74bRFvuyKfEfn8dD/0 ebQApC+KJjT9eVwbLosm5NpaqQpXsO3WTxnhzaRJDv/xFcdVe14MwJcIhQoiRDTJSL/W6eFzJjHe1 vI2B1haVjD6rVls1PGmwvQ==; In-Reply-To: (message from Dmitry Gutov on Sat, 12 Oct 2024 01:38:38 +0300) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:293401 Archived-At: > Cc: 62940@debbugs.gnu.org, Filipp Gunbin > Date: Sat, 12 Oct 2024 01:38:38 +0300 > From: Dmitry Gutov > > --- a/doc/emacs/maintaining.texi > +++ b/doc/emacs/maintaining.texi > @@ -881,13 +881,16 @@ Old Revisions > > @kindex C-u C-x v = > To compare two arbitrary revisions of the current VC fileset, call > -@code{vc-diff} with a prefix argument: @kbd{C-u C-x v =}. This > -prompts for two revision IDs (@pxref{VCS Concepts}), and displays a > -diff between those versions of the fileset. This will not work > -reliably for multi-file VC filesets, if the version control system is > -file-based rather than changeset-based (e.g., CVS), since then > -revision IDs for different files would not be related in any > -meaningful way. > +@code{vc-diff} with a prefix argument: @kbd{C-u C-x v =}. This prompts > +for two revision IDs (@pxref{VCS Concepts}), and displays a diff between > +those versions of the fileset. The first one has several default > +values: the revision before the last one when the fileset changed, and > +the last revision of the current branch's upstream. > +The second revision ID defaults to nil, which means the contents of > +the work tree. This will not work reliably for multi-file VC filesets, > +if the version control system is file-based rather than changeset-based > +(e.g., CVS), since then revision IDs for different files would not be > +related in any meaningful way. > > Instead of the revision ID, some version control systems let you > specify revisions in other formats. For instance, under Bazaar you > @@ -921,6 +924,10 @@ Old Revisions > prompts for two revision IDs (@pxref{VCS Concepts}), and displays a > diff between those versions of the entire version-controlled directory > trees (RCS, SCCS, CVS, and SRC do not support this feature). > +The first one has several default values: the revision before the last > +one when the fileset changed, and the last revision of the current > +branch's upstream. The second revision ID defaults to nil, which means > +the contents of the work tree. Nitpicking: please use @code{nil} in Texinfo documentation, not a literal "nil".