From: Seth House <seth@eseth.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: David Aguilar <davvid@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
git@vger.kernel.org
Subject: Re: automerge implementation ideas for Windows
Date: Thu, 21 Jan 2021 18:09:02 -0700 [thread overview]
Message-ID: <20210122010902.GA48178@ellen> (raw)
In-Reply-To: <xmqqk0s5c3bv.fsf@gitster.c.googlers.com>
On Thu, Jan 21, 2021 at 02:50:12PM -0800, Junio C Hamano wrote:
> I'd rather not to see us do "text processing" in shell
Agreed. What are your thoughts on the #2 approach?
I noticed the comment in `git/xdiff-interface.h` about xdiff's gigabyte
limit so I created a 973 MB text file with a conflict and ran #2 through
a few mergetools to see how it went. I put /usr/bin/time in front of the
two `git merge-file` invocations. I know one person's machine is not
a benchmark but perhaps it's a discussion point?
Each `git merge-file` call took ~11 seconds on my middle-tier laptop and
did not use enough RAM to hit swap.
Writing the near-gigabyte LOCAL, BASE, REMOTE, & BACKUP files went
pretty quick. The mergetools themselves had mixed results:
- vimdiff took several minutes (and a lot of swap) to open all four
files but did eventually work.
- tkdiff crashed.
- Meld spun for ~10 minutes and never opened.
My takeaway: when trying to use a mergetool on a very large file, the
two `git merge-file` invocations are not likely to be where the
performance concern is. #2 is my preferred approach so far.
next prev parent reply other threads:[~2021-01-22 1:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-09 21:49 [PATCH] fixup! mergetool: add automerge configuration David Aguilar
2021-01-09 21:59 ` brian m. carlson
2021-01-09 22:42 ` [PATCH v2] " David Aguilar
2021-01-09 22:54 ` Seth House
2021-01-10 1:17 ` Junio C Hamano
2021-01-10 6:40 ` Re* " Junio C Hamano
2021-01-10 7:29 ` Seth House
2021-01-10 11:24 ` Junio C Hamano
2021-01-16 4:24 ` Seth House
2021-01-20 23:24 ` automerge implementation ideas for Windows Seth House
2021-01-21 22:50 ` Junio C Hamano
2021-01-22 1:09 ` Seth House [this message]
2021-01-22 2:26 ` Junio C Hamano
2021-01-22 2:50 ` Re* [PATCH v2] fixup! mergetool: add automerge configuration brian m. carlson
2021-01-22 16:29 ` Johannes Schindelin
2021-01-22 23:25 ` brian m. carlson
2021-01-26 14:32 ` Johannes Schindelin
2021-01-26 18:06 ` Seth House
2021-01-26 20:10 ` Junio C Hamano
2021-01-27 3:37 ` Seth House
2021-01-29 0:41 ` Junio C Hamano
2021-01-09 23:18 ` Junio C Hamano
2021-01-10 1:52 ` Junio C Hamano
2021-01-09 23:21 ` [PATCH] " Junio C Hamano
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=20210122010902.GA48178@ellen \
--to=seth@eseth.com \
--cc=davvid@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.