From: Stefan Monnier <monnier@iro.umontreal.ca>
To: "Jan Djärv" <jan.h.d@swipnet.se>
Cc: emacs-devel@gnu.org
Subject: Re: Installing changes from branches
Date: Sat, 03 Apr 2010 10:08:11 -0400 [thread overview]
Message-ID: <jwv8w944p0m.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <4BB702D9.7000102@swipnet.se> ("Jan Djärv"'s message of "Sat, 03 Apr 2010 10:56:57 +0200")
> That is OK. I didn't even know comments got merged like this.
> Isn't the real problem that bzr requires a commit in the quickfix branch
> after a merge?
Bzr doesn't require any such thing. You decided to commit, not bzr.
That's linked to the fact that you decided to use "merge" rather than
"pull", i.e. use a separate branch.
> If you are doing some work that takes time, I find it easier to merge
> from the trunk from time to time, rather than taking a big hit at
> the end.
There are many different ways to do it. I suggested a few in the part
of the message you elided:
- "For such changes, it's a lot better to just take the diff from the
branch, apply to the trunk and commit". That's what I do, as a matter
of fact, and I have grown to like it, since this "diff&patch" is
a good opportunity to rework/cleanup the patch one last time before
committing it.
- "Or to use "bzr rebase" instead".
- "Another very good solution is to not use quickfix branches at all, but
use shelves instead".
> Something like a collapsed merge would be good, i.e. merge from quickfix,
> but only record it as a single commit.
Indeed, you can also do that:
cd .../trunk
bzr merge .../quickfix
bzr revert --forget-merges
bzr commit ...
that's virtually the same as "diff&patch": it forgets all about the
branch's history.
Stefan
next prev parent reply other threads:[~2010-04-03 14:08 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 [this message]
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
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
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=jwv8w944p0m.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=jan.h.d@swipnet.se \
/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).