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

Re: [PATCH v3] mergetool: Provide an empty file when needed

From
JWJason Wenger <jcwenger@gmail.com>
Date
Jan 20, 2012, 14:03 UTC
Message-ID
<CAM6z=4-HfRAjJjnYqfoiYsYjiZJSsbkCaW-VtLWvoeFM0xsB9g@mail.gmail.com>
In-Reply-To
<CAJDDKr71Q9ihLZdP1Pu=ebpvX0EPvW-9bN6kZz9MeuhYKZzh+Q@mail.gmail.com>
On Fri, Jan 20, 2012 at 01:53, David Aguilar <davvid@gmail.com> wrote:
Show 7 quoted lines
> On Thu, Jan 19, 2012 at 11:47 PM, David Aguilar <davvid@gmail.com> wrote:
>> Some merge tools cannot cope when $LOCAL, $BASE, or $REMOTE
>> are missing.  $BASE can be missing when two branches
>> independently add the same filename.  $LOCAL and $REMOTE
>> can be missing when a delete/modify conflict occurs.
>>
>> Provide an empty file to make these tools happy.

This is cleaner, yes -- but is this extra processing on $LOCAL and $REMOTE necessary? Git mergetool doesn't actually call an external mergetool during del/mod conflicts -- instead it goes into an alternate processing and prompts the user interactively whether to take the deleted or modified file. Can these changes be reached? (command line option I'm not aware of?)

--jcw
Previous: David AguilarNext: Junio C Hamano
Message 14 of 17 in “Interesting behavior in git mergetool with no BASE revision”
  1. Jason WengerJan 18, 2012
  2. David AguilarJan 20, 2012
  3. mergetool: Provide an empty file when no base existsDavid Aguilar, Jan 20, 2012
  4. David AguilarJan 20, 2012
  5. Junio C HamanoJan 20, 2012
  6. David AguilarJan 20, 2012
  7. mergetool: Provide an empty file when no base existsDavid Aguilar, Jan 20, 2012
  8. Junio C HamanoJan 20, 2012
  9. David AguilarJan 20, 2012
  10. Junio C HamanoJan 20, 2012
  11. Junio C HamanoJan 20, 2012
  12. mergetool: Provide an empty file when neededDavid Aguilar, Jan 20, 2012
  13. David AguilarJan 20, 2012
  14. Jason WengerJan 20, 2012
  15. Junio C HamanoJan 20, 2012
  16. mergetool: Provide an empty file when neededDavid Aguilar, Jan 20, 2012
  17. mergetool: Provide an empty file when no base existsDavid Aguilar, Jan 20, 2012

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.