From: Tay Ray Chuan <rctay89@gmail.com>
Date: Sun, 22 Jan 2012 04:03:19 GMT
Subject: Re: Finding all commits which modify a file
Message-ID: <CALUzUxpy+XdfMYqX8TGnpQ72FfvpF_VYP-19fTDLrD-=9CN3uw@mail.gmail.com>
In-Reply-To: <46043.208.70.151.129.1327095331.squirrel@mail.lo-cal.org>

On Sat, Jan 21, 2012 at 5:35 AM, Neal Groothuis <ngroot@lo-cal.org> wrote:
> Hello,
>
> I'm trying to find /all/ commits that change a file in the
> repository...and its proving to be trickier than I thought. :-)
>
> The situation that we were dealing with is this:
>
> - Person A and person B both pull from the same central repository.
>
> - Person A makes a change to file foo.txt and bar.txt, commits, and pushes
> to the central repository.
>
> - Person B makes a similar change to bar.txt and commits it.
>
> - Person B does a fetch and merge.  Since both A and B made changes to
> bar.txt, this requires conflicts to be resolved manually.
>
> - B reverts A's changes to foo.txt. (If B is coming from a different
> revision control system, this may happen due to confusion about how merges
> are handled.)

How is this "revert" done? Was it done at the conflict resolution
level or with a git-revert invocation?

Nonetheless, either way, A's commit would be still be present in the
log history.

>[snip]
> Graphically:
>
>    A1
>   /  ^
>  v    \
>  C1   B2<-B3
>  ^    /
>   \  v
>    B1
>
> B1, B2, and B3 have the same version of foo.txt as C1, A1 modifies it.

Just to clarify, is C1 the commit that both A and B both share when
they first pull in the first step? And B2 is the merge?

-- 
Cheers,
Ray Chuan