all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Dan Nicolaescu <dann@ics.uci.edu>
Cc: esr@thyrsus.com, emacs-devel@gnu.org
Subject: Re: Another VC terminology change?
Date: Fri, 12 Oct 2007 13:34:40 -0400	[thread overview]
Message-ID: <jwvhckw5jdh.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <200710121647.l9CGlpLY011358@oogie-boogie.ics.uci.edu> (Dan Nicolaescu's message of "Fri\, 12 Oct 2007 09\:47\:51 -0700")

>> You mean API rather than UI, right?
> I mean UI. How does the user request a merge on such a VCS?  Using
> "C-x v +" from any VC managed file?  Should it then warn that the
> whole tree is getting merged?

No: it needs to do it from a place where he can specify the right fileset,
i.e. from vc-dired (or maybe from just `dired' depending on how this works).

> What happens if there are conflicts in files that are not opened?
> Should VC show pop a vc-dired window and show them?

The Lisp of possible features is open ended, but if the command was run from
a vc-dired buffer, there's nothing special to do, which is a good reason to
request that such commands be run from a vc-dired buffer.


        Stefan

  reply	other threads:[~2007-10-12 17:34 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-11 14:30 Another VC terminology change? Eric S. Raymond
2007-10-11 17:25 ` Stefan Monnier
2007-10-11 18:05   ` Eric S. Raymond
2007-10-11 20:08     ` Stefan Monnier
2007-10-11 20:19       ` Eric S. Raymond
2007-10-12  1:06         ` Stefan Monnier
2007-10-12  0:45   ` Dan Nicolaescu
2007-10-12  1:08     ` Stefan Monnier
2007-10-12 15:23       ` Dan Nicolaescu
2007-10-12 16:25         ` Stefan Monnier
2007-10-12 16:47           ` Dan Nicolaescu
2007-10-12 17:34             ` Stefan Monnier [this message]
2007-10-12 21:28               ` Dan Nicolaescu
2007-10-13  3:36                 ` Stefan Monnier
2007-10-11 17:40 ` Richard Stallman
2007-10-11 17:50   ` Eric S. Raymond
2007-10-12  8:24     ` Eli Zaretskii
2007-10-12 15:59     ` Richard Stallman
2007-10-12 20:02       ` Miles Bader
2007-10-13  6:41         ` Richard Stallman
2007-10-14 21:42           ` Juri Linkov
2007-10-15 16:03             ` Richard Stallman
2007-10-15 17:42               ` Stefan Monnier
2007-10-15 21:37                 ` Eric S. Raymond
2007-10-18 20:08                 ` Richard Stallman
2007-10-19 21:42                   ` Eric S. Raymond
2007-10-21  7:27                     ` Richard Stallman
2007-10-12  8:14 ` Eli Zaretskii

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=jwvhckw5jdh.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=dann@ics.uci.edu \
    --cc=emacs-devel@gnu.org \
    --cc=esr@thyrsus.com \
    /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.