git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] Make cherry-pick use rerere for conflict resolution.

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 11, 2008, 15:54 UTC
Message-ID
<alpine.DEB.1.00.0808111748220.24820@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To
<48A0274D.8090504@viscovery.net>
Hi,
On Mon, 11 Aug 2008, Johannes Sixt wrote:
Show 6 quoted lines
> Johannes Schindelin schrieb:
> > That would actually be a problem, no?  I am not sure that resolutions 
> > for reverts make sense for cherry-picks, so I am not sure if 
> > resolutions should be recorded for reverts.
> 
> Of course they should.
Are you sure?
> If the reversal is part of a topic branch that you rebase at least once, 
> then you want to have the resolutions recorded, don't you?

That is not the revert we are talking about. The revert we are talking about is a literal "git revert <commit>". Not a replay of a commit (that might have been a revert originally).

I am a little worried that these reverts (being negative changes) could interfer with the common operation: positive changes. Although I haven't been able to come up with a scenario where the recorded revert would actively be wrong in a subsequent rebase/cherry-pick.

Yes, I see your point that a revert on a topic branch which is then rebased would be nice to have its resolution recorded; that will happen with the first rebase, though.

However, if my suspicion is true, recording the resolution only with the first rebase could make things safer overall, because an occasional temporary revert would not affect later cherry-picks in an unintuitive way.

Thinking about a good example, or a counterexample, Dscho

Previous: Johannes SixtNext: Johannes Sixt
Message 8 of 12 in “Make cherry-pick use rerere for conflict resolution.”
  1. Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen, Aug 10, 2008
  2. Johannes SchindelinAug 10, 2008
  3. Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen, Aug 11, 2008
  4. Johannes SchindelinAug 11, 2008
  5. Petr BaudisAug 11, 2008
  6. Johannes SchindelinAug 11, 2008
  7. Johannes SixtAug 11, 2008
  8. Johannes SchindelinAug 11, 2008
  9. Johannes SixtAug 12, 2008
  10. Junio C HamanoAug 11, 2008
  11. Abhijit Menon-SenAug 12, 2008
  12. Junio C HamanoAug 12, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.