all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Robert J. Chassell" <bob@rattlesnake.com>
To: emacs-devel@gnu.org
Subject: Re: vc-next-action problem
Date: Mon, 25 Feb 2008 20:06:20 +0000 (UTC)	[thread overview]
Message-ID: <m1JTjae-002K4LC@rattlesnake.com> (raw)
In-Reply-To: <200802251756.m1PHuVhD017513@sallyv1.ics.uci.edu> (message from Dan Nicolaescu on Mon, 25 Feb 2008 09:56:30 -0800)

    Can you please explain step by step what you did ...

First, I updated CVS and bootstrapped.

I visited two modified files, ... emacs/lisp/help-mode.el and
... emacs/lisp/help-fns.el

Then I wrote what I did in the big Changelog invoked with C-x 4 a
(add-change-log-entry-other-window) for the two files.  All the
previous worked fine.

Then I invoked the small changelog with C-x v v (vc-next-action) for
one of the files and put material for that file in it.  I did not
realize the two files were a fileset; I expected the next action would
be for just that one file.

I switched buffer to the other file, then switched back to the small
changelog and typed C-c C-c to commit the first file.  That committed
the second file, not the first, with the documentation for the first,
the wrong documentation for it.

(Then I tried to find out what to do with an error, visited vc.el,
etc. without success.  I spend quite a bit of time doing this both
before and after committing the second file.)

I switched to the second file, invoked the small changelog with C-x v
v (vc-next-action), put in the documentation for it, typed C-c C-c to
commit both the second file and the small change log.  As far as I can
determine with C-x v l (vc-print-log) that went correctly.

Then I switched to the big ChangeLog, invoked a small changelog for it
with C-x v v (vc-next-action) with no contents, as recommended to me
(and I think to the rest on this list) on 4 Nov 2006, typed C-c C-c to
commit the big ChangeLog and the empty small changelog.
That seems to have worked fine.

Lastly, I checked by updating CVS again.  (Nothing appeared.)

The commitments for the files and for the big ChangeLog went fine.  So
did the commitment for the small change log for ... emacs/lisp/help-fns.el.

The problem is with the commitment for the small change log for
... emacs/lisp/help-mode.el.

My question is what do I do when I make a mistake?

-- 
    Robert J. Chassell                          GnuPG Key ID: 004B4AC8
    bob@rattlesnake.com                         bob@gnu.org
    http://www.rattlesnake.com                  http://www.teak.cc




  reply	other threads:[~2008-02-25 20:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-25 16:56 vc-next-action problem Robert J. Chassell
2008-02-25 17:56 ` Dan Nicolaescu
2008-02-25 20:06   ` Robert J. Chassell [this message]
2008-02-25 21:54     ` Dan Nicolaescu
2008-02-26  2:10       ` Robert J. Chassell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m1JTjae-002K4LC@rattlesnake.com \
    --to=bob@rattlesnake.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.