unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Dan Nicolaescu <dann@ics.uci.edu>
To: Miles Bader <miles@gnu.org>
Cc: 2675@emacsbugs.donarmstrong.com
Subject: bug#2675: 23.0.91; unnecessary vc-next-action conflicts in vc-dir directory
Date: Sun, 15 Mar 2009 02:20:50 -0700 (PDT)	[thread overview]
Message-ID: <200903150920.n2F9KoWO015533@godzilla.ics.uci.edu> (raw)
In-Reply-To: <87ocw3cxjy.fsf@catnip.gol.com> (Miles Bader's message of "Sun, 15 Mar 2009 11:46:57 +0900")

Miles Bader <miles@gnu.org> writes:

  > [Note: I have Dan's patch for fixing whole-directory vc-dir commit in
  > Git applied, though I don't think it should affect the following, as it
  > relates to final commit.]
  > 
  > If I have a vc-dir buffer showing a tree with some "up-to-date" entries
  > from previously committed files, and also some entries for newly changed
  > files:
  > 
  >    VC backend : Git
  >    Working dir: /tmp/zonk/
  >    Branch     : master
  > 
  >                             ./
  >         up-to-date          newf2
  >         up-to-date          newf3
  >         unregistered        newf4
  >         up-to-date          ppling
  > 
  > Then hitting "v" on the first line of the buffer gives the following
  > error:
  > 
  >    vc-dir-deduce-fileset: /tmp/zonk/newf4:unregistered clashes with /tmp/zonk/newf2:up-to-date
  > 
  > This seems like a silly and pointless error -- it should probably simply
  > ignore any "up-to-date" entries when checking for conflicts.

If you look at vc-next-action, you'll see that it's possible to do
things to files in the 'up-to-date state, and it's not the same as what
it's done to unregistered files.

vc-next-action wants to treat all the files the same, that's the reason
for this check.







  reply	other threads:[~2009-03-15  9:20 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-15  2:46 bug#2675: 23.0.91; unnecessary vc-next-action conflicts in vc-dir directory Miles Bader
2009-03-15  9:20 ` Dan Nicolaescu [this message]
2009-03-15 10:01   ` Miles Bader
2009-03-15 15:07     ` Dan Nicolaescu
     [not found]     ` <mailman.3233.1237130630.31690.bug-gnu-emacs@gnu.org>
2009-03-15 23:12       ` Miles Bader
2009-03-17  0:58         ` Dan Nicolaescu
2009-03-16  0:50 ` Stefan Monnier
2009-03-16  1:12   ` Miles Bader
2009-03-17  1:08     ` Dan Nicolaescu

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=200903150920.n2F9KoWO015533@godzilla.ics.uci.edu \
    --to=dann@ics.uci.edu \
    --cc=2675@emacsbugs.donarmstrong.com \
    --cc=miles@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 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).