all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Chong Yidong <cyd@stupidchicken.com>
Cc: Dan Nicolaescu <dann@gnu.org>, emacs-devel@gnu.org
Subject: Re: vc-update for bzr etc.
Date: Sun, 21 Nov 2010 21:04:28 -0500	[thread overview]
Message-ID: <jwv7hg6unct.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87mxp2bd12.fsf@stupidchicken.com> (Chong Yidong's message of "Sun, 21 Nov 2010 16:08:25 -0500")

>>> So the full functionality for Bzr should be something like this:
>>> - If it's a bound branch, do bzr update.
>>> - Otherwise, if there is a default pull location, prompt for a location
>>> and do "bzr merge --pull".
>>> - Otherwise, just do "bzr merge --pull" to use the default location.
>>> Does this sound right?
>> 
>> If it's not bound, it should just use "bzr pull" without prompting
>> the user, IMO.

> The "bzr pull" operation only works if the branches have not diverged.
> If the vc pull operation corresponds to "bzr pull", then what would it
> do in git?  IIUC, git pulls perform merging automatically, so if vc-pull
> does "bzr pull" in bzr and "git pull" in git, it would be doing two
> different things.

> That's why I thought the closest common denominator would be to use
> bzr's "merge --pull".

VC tries to present a uniform UI and that is good, but trying to impose
a uniform semantics to all commands is asking too much.  So I think it's
perfectly OK for vc-pull/update to do "bzr pull" for Bzr and
"git pull" for Git, even if they don't do exactly the same thing.


        Stefan



  reply	other threads:[~2010-11-22  2:04 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-21 15:43 vc-update for bzr etc Chong Yidong
2010-11-21 17:00 ` Andreas Schwab
2010-11-21 17:09 ` Dan Nicolaescu
2010-11-21 17:33   ` Chong Yidong
2010-11-21 20:20     ` Stefan Monnier
2010-11-21 21:08       ` Chong Yidong
2010-11-22  2:04         ` Stefan Monnier [this message]
2010-11-22  4:31           ` Stephen J. Turnbull
2010-11-22  8:40             ` Thien-Thi Nguyen
2010-11-22 11:04               ` Stephen J. Turnbull
2010-11-22 14:39             ` Stefan Monnier
2010-11-22 17:29               ` Chong Yidong
2010-11-23 15:37                 ` Stephen J. Turnbull
2010-11-23 16:20                   ` Stefan Monnier
2010-11-22  4:35           ` Chong Yidong
2010-11-22  6:52             ` Dan Nicolaescu
2010-11-22 14:42               ` Stefan Monnier
2010-11-22 10:54             ` Eli Zaretskii
2010-11-22 14:41               ` Stefan Monnier
2010-11-23  1:40                 ` Chong Yidong
2010-11-23 14:27                   ` Stefan Monnier
2010-11-23 16:08                     ` Chong Yidong
2010-11-23 17:03                       ` Dan Nicolaescu
2010-11-23 17:02                   ` Dan Nicolaescu
2010-11-23 19:29                     ` Chong Yidong
2010-11-23 22:05                       ` Stefan Monnier
2010-11-23 22:34                       ` Dan Nicolaescu
2010-11-24 17:19                         ` Chong Yidong
2010-11-22 16:57               ` Chong Yidong
2010-11-22 17:59                 ` Eli Zaretskii
2010-11-21 19:03 ` Stefan Monnier
2010-11-21 19:34   ` Chong Yidong

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=jwv7hg6unct.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=cyd@stupidchicken.com \
    --cc=dann@gnu.org \
    --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.