From: "H. Peter Anvin" <hpa@zytor.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Recursive merge still doesn't handle reorganized repositories
Date: Tue, 03 Jan 2006 17:58:50 -0800 [thread overview]
Message-ID: <43BB2BDA.6070404@zytor.com> (raw)
Well, I got the chance to try out "git-merge -s recursive" to try to
deal with the two different reorganized klibc repositories. I'm sad to
report that it doesn't really work, and that every merge has to be
propagated manually.
The two repos are at:
git://git.kernel.org/pub/scm/libs/klibc/klibc.git
git://git.kernel.org/pub/scm/libs/klibc/klibc-renamed.git
What I want is for a change to the first to propagate naturally to the
second.
-hpa
reply other threads:[~2006-01-04 1:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=43BB2BDA.6070404@zytor.com \
--to=hpa@zytor.com \
--cc=git@vger.kernel.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.
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 NNTP newsgroup(s).