From: Thomas Rast <trast@student.ethz.ch>
To: J Robert Ray <jrobertray@gmail.com>
Cc: <git@vger.kernel.org>
Subject: Re: rebase -p loses amended changes
Date: Sat, 31 Mar 2012 00:49:55 +0200 [thread overview]
Message-ID: <87ty15vh4c.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: <CADb3U=4DNt7Jnzq4eW-K+W1_sEfMgL6MxqY6qmPaJZagiFdmmg@mail.gmail.com> (J. Robert Ray's message of "Fri, 30 Mar 2012 14:31:24 -0700")
J Robert Ray <jrobertray@gmail.com> writes:
> If a merge is amended to add changes to a file unaffected by the
> merge, these changes are lost after a rebase. Attached is a script to
> demonstrate the problem.
> 4. Merge (--no-ff) "mod-a" onto master.
>
> 5. Amend the merge with a modification to a.
> 7. Rebase -p master onto "master-copy."
>
> Notice the change to "a" from step #5 is now gone. "a" reverts to the
> pre-amended version after step #4.
That's pretty much expected. rebase -p attempts to (conflicts will
happen again) replay the merge. I don't think anybody's come up with a
clear idea of how to apply the conflicted or evil parts of the merge
mechanically.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2012-03-30 22:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-30 21:31 rebase -p loses amended changes J Robert Ray
2012-03-30 22:49 ` Thomas Rast [this message]
[not found] <592E2EEC-6CBA-48D6-8D44-34A971DD78EC@gmail.com>
2012-03-31 5:55 ` Jon Seymour
2012-03-31 9:35 ` Thomas Rast
2012-03-31 9:39 ` Jon Seymour
2012-04-03 18:55 ` J Robert Ray
2012-04-03 21:43 ` Jon Seymour
2012-04-03 22:02 ` Junio C Hamano
2012-04-03 22:09 ` Phil Hord
2012-04-04 6:30 ` Johannes Sixt
2012-04-04 17:11 ` Junio C Hamano
2012-04-04 20:26 ` Junio C Hamano
2012-04-04 22:55 ` Jon Seymour
2012-04-04 22:59 ` Junio C Hamano
2012-04-04 23:05 ` Jon Seymour
2012-04-04 23:20 ` Junio C Hamano
2012-04-05 16:16 ` Martin von Zweigbergk
2012-04-05 16:33 ` Jon Seymour
2012-04-05 16:43 ` Martin von Zweigbergk
2012-04-10 7:14 ` Johannes Sixt
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=87ty15vh4c.fsf@thomas.inf.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=jrobertray@gmail.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 NNTP newsgroup(s).