From: Matthias Kestenholz Date: Thu, 04 Sep 2008 10:18:28 GMT Subject: Re: Failed expectations or bug? Message-ID: <1f6632e50809040318n2974cdf2t3664c759978dc8d3@mail.gmail.com> In-Reply-To: On Thu, Sep 4, 2008 at 11:49 AM, Pedro Melo wrote: > Hi, > > I was learning about git rename detection and came across a unexpected > result. See the following sequence: > > [...] > > Maybe I have the wrong expectations, but after the merge I was expecting > either: > > * b and c have the same content, with the modified D; > * b has the modifications made in master, and c has the original content. > > I did not expect the patch to 'a' in master to propagate across the copy to > c. > > What am I doing wrong here? > The rename detection needs more than a single character to work reliably. If you do roughly the same test but with bigger files you should get better the results. Matthias