From: Brian Gernhardt <benji@silverinsanity.com>
Date: Sun, 18 Mar 2007 16:06:12 GMT
Subject: Re: [RFH] straightening out "read-tree -m"
Message-ID: <16CD10D5-3BDA-4DFE-A8C6-96D48F511824@silverinsanity.com>
In-Reply-To: <20070318121810.GA17807@moooo.ath.cx>


On Mar 18, 2007, at 8:18 AM, Matthias Lederhofer wrote:

> Junio C Hamano <junkio@cox.net> wrote:
>> A	B	Outcome
>> ----------------------------------------------------------------
>> D	D	No problem.
>>
>> D	F	This should result in refusal when there are
>>                 local modification to paths in "foo" directory,
>> 		or there are untracked (but unignored) paths in
>>                 "foo/".
>
> What about ignored configuration files like config.mak?
> Let's say there is an ignored configuration file in a subdirectory.
> If this subdirectory is replaced by a file git would delete the
> ignored configuration file?

I would sincerely hope that a file not being tracked by git would  
count as "local modifications" in that case.  "Ignored" does not mean  
"unimportant".

My $0.02,
~~ Brian