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

Re: rebase: strange failures to apply patc 3-way

From
Max Horn <max@quendi.de>
Date
Mar 8, 2013, 17:35 UTC
Message-ID
<205D17C4-F737-46E9-BC48-D16D5948C707@quendi.de>
In-Reply-To
<CADeaMWp_R0HLwEYn7O3oX4-0OoSeqLfzz_2AYXT-Po88nM4HkQ@mail.gmail.com>
Am 08.03.2013 um 16:32 schrieb Andrew Wong <andrew.kw.w@gmail.com>:
Show 11 quoted lines
> On 3/8/13, Max Horn <max@quendi.de> wrote:
>> All in all, I suspect that Mac OS X and/or the filesystem (HFS+ with
>> journaling, not case sensitive (the default)) might be at fault. Still, this
>> is quite puzzling and annoying, and so I still wonder if anybody has any
>> insights on this.
> 
> When "rebase" errors out at COMMIT A, try manually running "git apply"
> on the patch file (rebase-apply/patch) a couple times, and see if the
> error occurs randomly. You'd have to do a "reset --hard" to revert the
> changes done by "git apply" every time before you run it again. The
> error from "git apply" might shed more light on the issue.
I tried this a dozen times, but 'git apply' failed to fail even once. No surprise there, given that the patch that throws off rebase every time is clean and simple. I am flabbergasted :-(
Previous: Andrew WongNext: Andrew Wong
Message 4 of 27 in “rebase: strange failures to apply patc 3-way”
  1. Max HornMar 7, 2013
  2. Max HornMar 8, 2013
  3. Andrew WongMar 8, 2013
  4. Max HornMar 8, 2013
  5. Andrew WongMar 8, 2013
  6. Max HornMar 8, 2013
  7. Andrew WongMar 8, 2013
  8. Max HornMar 9, 2013
  9. Andrew WongMar 9, 2013
  10. Andrew WongMar 9, 2013
  11. Max HornMar 10, 2013
  12. Andrew WongMar 11, 2013
  13. Max HornMar 11, 2013
  14. Andrew WongMar 11, 2013
  15. Max HornMar 11, 2013
  16. Max HornMar 11, 2013
  17. Andrew WongMar 11, 2013
  18. Max HornMar 11, 2013
  19. Andrew WongMar 11, 2013
  20. Max HornMar 12, 2013
  21. Max HornMar 12, 2013
  22. John SzakmeisterMar 12, 2013
  23. Andrew WongMar 12, 2013
  24. Jeff KingMar 12, 2013
  25. Andrew WongMar 12, 2013
  26. Jeff KingMar 12, 2013
  27. Heiko VoigtMar 12, 2013

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.