From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Gerrit Pape" <pape@smarden.org>,
git@vger.kernel.org, "Rémi Vanicat" <vanicat@debian.org>
Subject: merge-one-file, was Re: [PATCH] merge-tree: sometimes, d/f conflict is not an issue
Date: Mon, 9 Jul 2007 16:06:44 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0707091604030.5546@racer.site> (raw)
In-Reply-To: <7v8x9q1x5t.fsf@assigned-by-dhcp.cox.net>
Hi,
On Sun, 8 Jul 2007, Junio C Hamano wrote:
> [PATCH] Fix merge-one-file for our-side-added/our-side-removed cases
FWIW I have a patch series in my local repo, which makes merge-one-file a
builtin, and even avoids fork()+exec()ing the program when called from
unpack_trees(). However, I never came around to understand all the corner
cases, and therefore did not write tests for it. Therefore, I am not
really sure if it works as intended. So I'd be very grateful if you could
write tests while you are touching it anyway...
Ciao,
Dscho
next prev parent reply other threads:[~2007-07-09 15:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070405071615.2915.6837.reportbug@acer>
[not found] ` <20070607074357.27760.qmail@69aef7b888effd.315fe32.mid.smarden.org>
[not found] ` <6b8a91420706070252y3fd581a3w427d91e5b982d29d@mail.gmail.com>
2007-06-13 9:16 ` unexpected git-cherry-pick conflict Gerrit Pape
2007-06-13 12:58 ` Johannes Schindelin
2007-06-13 13:43 ` Gerrit Pape
2007-06-13 14:43 ` Johannes Schindelin
2007-06-25 7:18 ` Gerrit Pape
2007-06-25 7:55 ` Johannes Schindelin
2007-07-07 20:58 ` Johannes Schindelin
2007-12-21 10:37 ` Gerrit Pape
2007-12-22 8:20 ` Junio C Hamano
2007-07-08 0:52 ` [PATCH] merge-tree: sometimes, d/f conflict is not an issue Johannes Schindelin
2007-07-08 1:31 ` Junio C Hamano
2007-07-08 2:00 ` Johannes Schindelin
2007-07-08 2:18 ` Johannes Schindelin
2007-07-08 4:35 ` Johannes Schindelin
2007-07-08 5:50 ` Junio C Hamano
2007-07-08 6:14 ` Junio C Hamano
2007-07-08 13:16 ` Johannes Schindelin
2007-07-08 20:02 ` Junio C Hamano
2007-07-09 15:06 ` Johannes Schindelin [this message]
2007-07-17 17:13 ` [PATCH 1/2] merge-recursive: " Johannes Schindelin
2007-08-08 14:39 ` Gerrit Pape
2007-07-17 17:14 ` [PATCH 2/2] Add tests for cherry-pick d/f conflict which should be none Johannes Schindelin
2007-07-08 12:53 ` [PATCH] merge-tree: sometimes, d/f conflict is not an issue Johannes Schindelin
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=Pine.LNX.4.64.0707091604030.5546@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pape@smarden.org \
--cc=vanicat@debian.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).