From: "Jakub Narębski" <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
"David J. Bakeman" <nakuru@comcast.net>
Cc: Jacob Keller <jacob.keller@gmail.com>,
Git mailing list <git@vger.kernel.org>
Subject: Re: merge maintaining history
Date: Fri, 20 Jan 2017 12:37:37 +0100 [thread overview]
Message-ID: <38ca43cb-2fc7-0448-352f-7d9413f815c5@gmail.com> (raw)
In-Reply-To: <xmqq37gezpz8.fsf@gitster.mtv.corp.google.com>
W dniu 19.01.2017 o 22:42, Junio C Hamano pisze:
> "David J. Bakeman" <nakuru@comcast.net> writes:
[...]
>> Thanks I think that's close but it's a little more complicated I think
>> :<( I don't know if this diagram will work but lets try.
>>
>> original A->B->C->D->E->F
>> \
>> first branch b->c->d->e
>>
>> new repo e->f->g->h
>>
>> Now I need to merge h to F without loosing b through h hopefully. Yes e
>> was never merged back to the original repo and it's essentially gone now
>> so I can't just merge to F or can I?
>
> With the picture, I think you mean 'b' is forked from 'B' and the
> first branch built 3 more commits on top, leading to 'e'.
>
> You say "new repo" has 'e' thru 'h', and I take it to mean you
> started developing on top of the history that leads to 'e' you built
> in the first branch, and "new repo" has the resulting history that
> leads to 'h'.
>
> Unless you did something exotic and non-standard, commit 'e' in "new
> repo" would be exactly the same as 'e' sitting on the tip of the
> "first branch", so the picture would be more like:
>
>> original A->B->C->D->E->F
>> \
>> first branch b->c->d->e
>> \
>> new repo f->g->h
>
> no?
On the other hand Git has you covered even if you did something
non-standard, like starting new repo from the _state_ of 'e', that
is you have just copied files and created new repository, having
'e' (or actually 'e*') as an initial commit.
original A<-B<-C<-D<-E<-F
\
first branch b<-c<-d<-e
new repo e*<-f<-g<-h
Note that arrows are in reverse direction, as it is newer commit
pointing to its parents, not vice versa.
Assuming that you have everything in a single repository, by adding
both original and new repo as "remotes", you can use 'git replace'
command to replace 'e*' with 'e'.
original A<-B<-C<-D<-E<-F
\
first branch b<-c<-d<-e
\
new repo \-f<-g<-h
(with refs/replace)
> Then merging 'h' into 'F' will pull everything you did since
> you diverged from the history that leads to 'F', resulting in a
> history of this shape:
>
>> original A->B->C->D->E->F----------M
>> \ /
>> first branch b->c->d->e /
>> \ /
>> new repo f->g->h
Then you would have the above history in repositories that fetched
refs/replace/*, and the one below if replacement info is absent:
original A<-B<-C<-D<-E<-F<-----------M
\ /
first branch b<-c<-d<-e /
/
new repo e*<-f->g->h
But as Junio said it is highly unlikely that you are in this situation.
HTH
--
Jakub Narębski
next prev parent reply other threads:[~2017-01-20 11:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-14 2:01 merge maintaining history David J. Bakeman
2017-01-15 6:24 ` Jacob Keller
2017-01-19 13:12 ` David J. Bakeman
2017-01-19 21:42 ` Junio C Hamano
2017-01-20 11:37 ` Jakub Narębski [this message]
2017-01-20 17:33 ` Junio C Hamano
2017-01-26 0:31 ` David J. Bakeman
2017-01-26 0:41 ` Jacob Keller
2017-01-19 21:58 ` Philip Oakley
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=38ca43cb-2fc7-0448-352f-7d9413f815c5@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=nakuru@comcast.net \
/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://80x24.org/mirrors/git.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).