From: Linus Torvalds <torvalds@linux-foundation.org>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Junio C Hamano <junkio@cox.net>,
git@vger.kernel.org, Alex Riesen <raa.lkml@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Gerrit Pape <pape@smarden.org>
Subject: Re: merge doesn't remove files
Date: Sun, 4 Feb 2007 02:40:38 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0702040234290.8424@woody.linux-foundation.org> (raw)
In-Reply-To: <20070204045933.GC16766@spearce.org>
On Sat, 3 Feb 2007, Shawn O. Pearce wrote:
>
> But that tree-ish doesn't have to be the first non-base
> argument to merge-recursive, does it? In practice it usually is,
> but can I assume it in the code?
Yes, the first branch is supposed to be the "current" one. That's the one
we compare to the index, and that we should already error out on if the
index doesn't match the tree. So yeah, a file should ever be removed only
if it existed in the old index (and by implication in the first branch,
since otherwise we should have failed the merge as not having a clean
tree anyway).
Linus
next prev parent reply other threads:[~2007-02-04 10:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-03 22:48 merge doesn't remove files Gerrit Pape
2007-02-04 0:48 ` Junio C Hamano
2007-02-04 1:41 ` Junio C Hamano
2007-02-04 4:59 ` Shawn O. Pearce
2007-02-04 10:40 ` Linus Torvalds [this message]
2007-02-04 3:50 ` Shawn O. Pearce
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.0702040234290.8424@woody.linux-foundation.org \
--to=torvalds@linux-foundation.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=pape@smarden.org \
--cc=raa.lkml@gmail.com \
--cc=spearce@spearce.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).