From: Tom Lord <lord@emf.net>
To: gcc@gcc.gnu.org
Cc: zack@codesourcery.com, mark@codesourcery.com
Subject: Re: basic-improvements merge status
Date: Mon, 16 Dec 2002 02:19:00 -0000 [thread overview]
Message-ID: <200212160958.BAA04232@emf.net> (raw)
In-Reply-To: <93090000.1040028121@warlock.codesourcery.com> (message from Mark Mitchell on Mon, 16 Dec 2002 00:42:02 -0800)
> ... but I just discovered that I don't know how. "cvs update
> -j gcc-3_4-basic-improvements-branch" tries to merge all of
> the merges from the trunk to the branch BACK into the trunk,
> causing a ton of spurious conflicts. What's the right way to
> do this? (I'm seriously considering "diff -ruN 3.3/ 3.4b/ |
> (cd top-of-trunk/ && patch -p1 -E"!)
I think that *is* the right way, roughly.
(In the alternate universe where gcc is managed with `arch') use:
larch star-merge gcc--basic-improvements gcc--mainline gcc-wd
That assumes that you want to start with basic-improvements and apply
the changes from mainline, which means that any real conflicts in
mainline will be kicked out to .rej files. If you'd rather have the
truly conflicting basic-improvements changes in .rej files, use:
larch star-merge gcc--mainline gcc--basic-improvements gcc-wd
If you've been cherry-picking those earlier merges, pipe
larch whats-missing ...
output into an `xargs' of
larch replay ...
If you now want to cherry pick rather than do a full merge, edit the
revision ids of the changes you want out of the output of:
larch whats-missing --summary
and apply `larch replay' to those.
Finally, if you want to do this merge in such a way the individual
changesets from basic-improvements appear as individual changesets
(i.e., clean single-purpose changes) on mainline, then use one of the
replay techniques -- but commit between each call to replay. That
will be a boon to people who have forks of mainline who themselves
cherry-pick from mainline changes. Your `diff' technique, and the
other `larch' techniques listed here, will smoosh together lots of
changes in a single commit -- forcing cherry-pickers to look to the
branches to get the clean changesets.
:-)
-t
next prev parent reply other threads:[~2002-12-16 9:58 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-12-15 15:46 Zack Weinberg
2002-12-15 20:57 ` Mark Mitchell
2002-12-16 1:02 ` Zack Weinberg
2002-12-16 1:05 ` Mark Mitchell
2002-12-16 2:19 ` Tom Lord [this message]
2002-12-16 11:52 ` DJ Delorie
2002-12-16 8:46 ` Jason R Thorpe
2002-12-16 1:46 ` Jan Hubicka
2002-12-16 12:55 ` Geoff Keating
2002-12-16 13:11 ` Robert McNulty Junior
2002-12-16 14:39 ` Mark Mitchell
2002-12-16 10:26 David Edelsohn
2002-12-16 13:52 David Edelsohn
2002-12-16 13:57 ` Zack Weinberg
2002-12-16 14:23 ` David Edelsohn
2002-12-16 14:27 ` Jan Hubicka
2002-12-16 14:47 ` Neil Booth
2002-12-16 15:10 ` Jan Hubicka
2002-12-17 0:50 ` Gabriel Dos Reis
2002-12-17 15:54 ` Richard Henderson
2002-12-17 16:14 ` Gabriel Dos Reis
2002-12-18 5:29 ` Jan Hubicka
2002-12-17 16:19 ` Matt Austern
2002-12-17 16:31 ` Phil Edwards
2002-12-16 21:32 ` Joseph S. Myers
2002-12-16 17:01 ` Mark Mitchell
2002-12-17 0:47 ` Gabriel Dos Reis
2002-12-17 0:54 ` Jan Hubicka
2002-12-17 1:19 ` Gabriel Dos Reis
2002-12-16 14:29 ` Jan Hubicka
2002-12-16 14:29 ` David Edelsohn
2002-12-16 14:35 ` Jan Hubicka
2002-12-17 0:55 ` Gabriel Dos Reis
2002-12-17 0:58 ` Jan Hubicka
2002-12-17 1:53 ` Gabriel Dos Reis
2002-12-17 4:16 ` Jan Hubicka
2002-12-17 4:29 ` Fergus Henderson
2002-12-17 8:39 ` Gabriel Dos Reis
2002-12-17 13:58 ` Jan Hubicka
2002-12-16 14:44 ` David Edelsohn
2002-12-16 14:45 ` Jan Hubicka
2002-12-16 14:52 ` David Edelsohn
2002-12-16 14:54 ` Jan Hubicka
2002-12-16 17:05 ` Mark Mitchell
2002-12-17 0:44 ` Jan Hubicka
2002-12-17 0:46 ` Mark Mitchell
2002-12-17 0:51 ` Jan Hubicka
2002-12-17 4:10 ` Joseph S. Myers
2002-12-17 7:06 ` Gabriel Dos Reis
2002-12-17 11:42 ` Joseph S. Myers
2002-12-17 9:43 ` Mark Mitchell
2002-12-17 14:06 ` Jan Hubicka
2002-12-17 14:18 ` Gabriel Dos Reis
2002-12-17 0:54 ` Jan Hubicka
2002-12-17 3:24 ` Gabriel Dos Reis
2002-12-17 1:51 ` Gabriel Dos Reis
2002-12-17 21:31 ` Alexandre Oliva
2002-12-17 21:21 ` Alexandre Oliva
2002-12-18 5:44 ` Jan Hubicka
2002-12-17 1:16 ` Gabriel Dos Reis
2002-12-16 15:40 ` Dale Johannesen
2002-12-16 16:16 ` Jan Hubicka
2002-12-16 17:12 ` Dale Johannesen
2002-12-16 19:16 ` Fergus Henderson
2002-12-17 1:14 ` Gabriel Dos Reis
2002-12-17 3:48 ` Joseph S. Myers
2002-12-16 15:55 ` Benjamin Kosnik
2002-12-16 16:10 ` Jan Hubicka
2002-12-16 15:56 ` Andrew Pinski
2002-12-17 0:53 ` Gabriel Dos Reis
2002-12-17 0:56 ` Jan Hubicka
2002-12-17 1:22 ` Gabriel Dos Reis
2002-12-17 3:20 ` Gabriel Dos Reis
2002-12-17 2:12 ` Gabriel Dos Reis
[not found] <B1F15313-1157-11D7-96C8-00039375D8A0@apple.com>
2002-12-16 17:44 ` Geoff Keating
2002-12-16 18:28 ` Zack Weinberg
2002-12-16 18:47 ` Geoff Keating
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=200212160958.BAA04232@emf.net \
--to=lord@emf.net \
--cc=gcc@gcc.gnu.org \
--cc=mark@codesourcery.com \
--cc=zack@codesourcery.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.
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).