git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
* rebase drops patches that have since been reverted
@ 2019-06-12 15:03 Shawn Landden
  2019-06-12 16:55 ` Johannes Sixt
  0 siblings, 1 reply; 2+ messages in thread
From: Shawn Landden @ 2019-06-12 15:03 UTC (permalink / raw)
  To: git

If a patch has been applied upstream AND THEN reverted, rebase still
drops the patch, requiring the use of relative rebase git rebase -i
HEAD~5 et cetera.

git rebase should detect reverts as well.

-Shawn Landden

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: rebase drops patches that have since been reverted
  2019-06-12 15:03 rebase drops patches that have since been reverted Shawn Landden
@ 2019-06-12 16:55 ` Johannes Sixt
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Sixt @ 2019-06-12 16:55 UTC (permalink / raw)
  To: Shawn Landden; +Cc: git

Am 12.06.19 um 17:03 schrieb Shawn Landden:
> If a patch has been applied upstream AND THEN reverted, rebase still
> drops the patch, requiring the use of relative rebase git rebase -i
> HEAD~5 et cetera.
> 
> git rebase should detect reverts as well.

You have the same patch that upstream has. Perhaps you cherry-picked it
from them, or they cherry-picked it from you. In any case, they thought
the patch was a good one.

Later upstream found a problem with the patch and decided to revert it.
Certainly, they didn't do this just for fun; they had a good reason.

Now you are rebasing against upstream. IOW, you are accepting the
authority of the upstream code. Then, why on earth would you not want to
accept their authorative word that the cherry-picked patch was bad and
needed to be reverted?

If you later find out that your patch is definitely needed, then it is
on you to prove that, for example, by including it again in your patch
series. That must be an explicit decision on your part, not an accident
that happens.

TLDR: Git worked as designed.

-- Hannes

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-12 15:03 rebase drops patches that have since been reverted Shawn Landden
2019-06-12 16:55 ` Johannes Sixt

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox