From: Dmitry Gutov <dgutov@yandex.ru>
To: Eric Abrahamsen <eric@ericabrahamsen.net>
Cc: Stefan Monnier <monnier@iro.umontreal.ca>, emacs-devel@gnu.org
Subject: Re: extracting commits from Elpa to original repo
Date: Sun, 21 Dec 2014 17:19:21 +0200 [thread overview]
Message-ID: <86ppbdvxmu.fsf@yandex.ru> (raw)
In-Reply-To: <87k31ld1e9.fsf@ericabrahamsen.net> (Eric Abrahamsen's message of "Sun, 21 Dec 2014 13:20:46 +0800")
Eric Abrahamsen <eric@ericabrahamsen.net> writes:
> I also used the "subtree split" command to create a separate branch
> within Elpa containing only the commits made on "packages/gnorb".
>
> I'd like to get Stefan's patch into my general Gnorb repo, in such a way
> that it doesn't create any conflicts or confusion the next time I pull
> into Elpa. I created a patch for his commit, but it doesn't apply
> cleanly to my other repo, and I suspect that fixing it up so that it
> does will simply defer the mess.
Why doesn't it? But anyway, you should fix it up and push, and then
solve any conflicts that might arise in the next merge.
The 'git subtree push' workflow described in the article you've linked
to can work too, in certain cases, but IIUC it only works well if the
separate repo was originally made from a split (otherwise you risk
pushing the whole elpa history into the external repo).
next prev parent reply other threads:[~2014-12-21 15:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-21 5:20 extracting commits from Elpa to original repo Eric Abrahamsen
2014-12-21 14:33 ` Stefan Monnier
2014-12-21 15:19 ` Dmitry Gutov [this message]
2014-12-22 1:41 ` Eric Abrahamsen
2014-12-22 2:10 ` Dmitry Gutov
2014-12-24 12:43 ` Ted Zlatanov
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=86ppbdvxmu.fsf@yandex.ru \
--to=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=eric@ericabrahamsen.net \
--cc=monnier@iro.umontreal.ca \
/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).