From: "Алексей Шумкин" <zapped@mail.ru>
To: git@vger.kernel.org
Subject: Merge two different repositories (v2.4 + v2.5) into the one (v2.4 -> v2.5). Possible?
Date: Tue, 11 Jan 2011 13:41:01 +0300 [thread overview]
Message-ID: <746745466.20110111134101@mail.ru> (raw)
Hi all!
1.5 years ago I had sources of a project in a SVN repository (actually it does not
matter what SCM was used before). And I had two branches: v2.4 and v2.5.
They differed enough at that moment and (as usual for SVN branches)
laid in two different folders.
Then I had known of Git and I decided to try to use this powerful DVCS.
But as I was a newbie I created two git-repositories: one per each
branch. So v2.4 has its own git-repo. v2.5 (and above) has another one.
Now I'd like to merge them as v2.5 was a continuos branch from v2.4,
but without a rebasing (i.e. without a global changing of v2.5
repository, which already has another branches)
It must look like LAST commit of v2.4 should be a PARENT of FIRST commit of v2.5
Now there's a question: Is it possible to do so (no rebasing!), and If
"yes" then how to?
next reply other threads:[~2011-01-11 10:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-11 10:41 Алексей Шумкин [this message]
2011-01-11 11:49 ` Merge two different repositories (v2.4 + v2.5) into the one (v2.4 -> v2.5). Possible? "Martin Krüger"
2011-01-11 12:33 ` Re[2]: " Алексей Шумкин
2011-01-11 12:41 ` Andreas Ericsson
2011-01-11 14:58 ` Re[2]: " Алексей Шумкин
2011-01-11 12:47 ` "Martin Krüger"
2011-01-11 13:21 ` Jakub Narebski
2011-01-11 14:49 ` Re[2]: " Алексей Шумкин
2011-01-11 15:16 ` Алексей Шумкин
2011-01-12 0:08 ` [RFC/PATCH] Documentation: start to explain what git replace is for Jonathan Nieder
2011-01-12 22:47 ` Maaartin
2011-01-13 7:52 ` Alexey Shumkin
2011-01-14 8:49 ` [RFC/PATCH 2/1] fixup! " Jonathan Nieder
2011-01-14 17:44 ` Maaartin-1
2011-01-14 19:30 ` Jonathan Nieder
2011-01-14 21:09 ` how multiple roots happen (Re: [RFC/PATCH 2/1] fixup! Documentation: start to explain what git replace is for) Jonathan Nieder
2011-01-14 22:48 ` [RFC/PATCH 2/1] fixup! Documentation: start to explain what git replace is for Jakub Narebski
2011-01-15 0:04 ` Maaartin-1
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=746745466.20110111134101@mail.ru \
--to=zapped@mail.ru \
--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 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.