all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: Installing changes from branches
Date: Sat, 03 Apr 2010 23:53:14 +0300	[thread overview]
Message-ID: <8363481cn9.fsf@gnu.org> (raw)
In-Reply-To: <87pr2go4om.fsf@telefonica.net>

> From: Óscar Fuentes <ofv@wanadoo.es>
> Date: Sat, 03 Apr 2010 18:56:41 +0200
> 
> If you use `bzr diff' and `patch' for incorporating your changes into
> `trunk', bzr is unable to track.

I obviously failed to drive the point home: in this workflow, I don't
_want_ bzr to track these changes.  I want them to look like changes
I made directly on the trunk.

> So you `bzr diff -rsubmit:' will generate a diff as if you had never
> incorporated your local changes into `trunk'.

After invoking `patch', there's a commit, so how can you say I never
"incorporated the changes into `trunk'"?  Perhaps you mean "merge"
instead of "incorporate".  In the latter case, that's exactly what I
want: it does what Stefan asked for -- avoid numerous merge commits on
the trunk when they bear no importance (due to insignificant amount of
real changes).





  reply	other threads:[~2010-04-03 20:53 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-03  1:05 Installing changes from branches Stefan Monnier
2010-04-03  1:37 ` Óscar Fuentes
2010-04-03  7:08   ` Eli Zaretskii
2010-04-03 13:56     ` Stefan Monnier
2010-04-03 14:19     ` Óscar Fuentes
2010-04-03 15:08       ` Eli Zaretskii
2010-04-03 15:14         ` Óscar Fuentes
2010-04-03 15:54           ` Eli Zaretskii
2010-04-03  2:26 ` Juanma Barranquero
2010-04-03  8:56 ` Jan Djärv
2010-04-03  9:17   ` Stephen J. Turnbull
2010-04-03 14:08   ` Stefan Monnier
2010-04-03 14:30     ` Óscar Fuentes
2010-04-03 15:18     ` Jan Djärv
2010-04-03 15:41       ` Óscar Fuentes
2010-04-03 16:29         ` Eli Zaretskii
2010-04-03 16:49           ` Eli Zaretskii
2010-04-03 16:56             ` Óscar Fuentes
2010-04-03 20:53               ` Eli Zaretskii [this message]
2010-04-03 21:13                 ` Óscar Fuentes
2010-04-03 19:14             ` Stefan Monnier
2010-04-03 19:31               ` Juanma Barranquero
2010-04-03 20:47                 ` Eli Zaretskii
2010-04-03 22:57                   ` Juri Linkov
2010-04-04  6:33                     ` Eli Zaretskii
2010-04-04 11:03                       ` Juri Linkov
2010-04-04 14:16                       ` Stefan Monnier
2010-04-04 14:18                 ` Stefan Monnier
2010-04-04 14:57                   ` Eli Zaretskii
2010-04-05 14:02                     ` Stefan Monnier
2010-04-04 14:58                   ` Juanma Barranquero

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=8363481cn9.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=ofv@wanadoo.es \
    /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.