From: Stephen Berman <stephen.berman@gmx.net>
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: emacs-devel@gnu.org
Subject: Re: Commit mistake?
Date: Sun, 25 Nov 2018 19:42:45 +0100 [thread overview]
Message-ID: <874lc5q9qy.fsf@gmx.net> (raw)
In-Reply-To: <jwva7lxkozn.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Sun, 25 Nov 2018 13:16:35 -0500")
On Sun, 25 Nov 2018 13:16:35 -0500 Stefan Monnier <monnier@IRO.UMontreal.CA> wrote:
>> I used VC. The file was listed in *vc-dir*, but it has been for ages
>> and was never a problem before.
>
> Hmm... IIUC it was there because it's a file we used to generate but we
> don't generate any more, so it's not ignored by .gitignore any more
> (i.e. you should just `rm` it).
Yes, I've since done that.
> I recommend you don't ignore files marked as "unknown" in *vc-dir*:
> they're a sign that there's a problem somewhere and it should be fixed
> either by removing the file, or renaming it, or by changing .gitignore.
Thanks, I'll bear that in mind.
>> But this time after I committed the change the status of that file
>> also changed to "up-to-date", which suprised me but, unfortunately,
>
> Do you remember exactly how you caused the commit? I guess you used `v`
> in *vc-dir*, but did you first select the files you wanted to commit, or
> did you rely on the position of point to specify the file(s) (maybe
> with point placed on a directory)?
I'm pretty sure I marked only the file I wanted to commit and then typed
`v' -- that's what I habitually do -- but I can't categorically rule out
that I may have just typed `v' without marking. I also don't recall
seeing the unwanted file in the list of files shown when editing the
commit message, but here too, I may have overlooked it.
Steve
next prev parent reply other threads:[~2018-11-25 18:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-25 13:22 Commit mistake? Stephen Berman
2018-11-25 16:34 ` Eli Zaretskii
2018-11-25 16:47 ` Stephen Berman
2018-11-25 17:06 ` Eli Zaretskii
2018-11-25 16:49 ` Stefan Monnier
2018-11-25 17:09 ` Stephen Berman
2018-11-25 18:16 ` Stefan Monnier
2018-11-25 18:42 ` Stephen Berman [this message]
2018-11-25 19:53 ` Stefan Monnier
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874lc5q9qy.fsf@gmx.net \
--to=stephen.berman@gmx.net \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).