Not sure what to do here. I got e6f9e917c53e1bf6215b38668f059d3f66ec51e1,
and have other problems now on the very first commit before any of the
merging stuff. It looks like the tfs working directory is not the same as
where git-tfs is expecting it to be. Perhaps unrelated?


On Mon, Sep 9, 2013 at 3:40 PM, Philippe Miossec
<notifications@github.com>wrote:

> In GitTfs/Core/GitTfsRemote.cs:
>
> > +        }
> > +
> > +        private string FindMergedRemoteAndFetch(int parentChangesetId, bool stopOnFailMergeCommit)
> > +        {
> > +            var tfsRemotes = FindTfsRemoteOfChangeset(Tfs.GetChangeset(parentChangesetId));
> > +            foreach (var tfsRemote in tfsRemotes)
> > +            {
> > +                var fetchResult = tfsRemote.Fetch(stopOnFailMergeCommit);
> > +            }
> > +            return Repository.FindCommitHashByCommitMessage("git-tfs-id: .*;C" + parentChangesetId + "[^0-9]");
> > +        }
> > +
> > +        private IEnumerable<IGitTfsRemote> FindTfsRemoteOfChangeset(IChangeset changeset)
> > +        {
> > +            //Don't know if there is a way to extract remote tfs repository path from changeset datas! Should be better!!!
> > +            return globals.Repository.ReadAllTfsRemotes().Where(r => changeset.Changes.Any(c => c.Item.ServerItem.ToLower().StartsWith(r.TfsRepositoryPath.ToLower())));
>
> Can you look at my last commit and tell me if that's what you think about?
> Otherwise, could you, please, explain a little more because I'm not sure to
> really understand...
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/git-tfs/git-tfs/pull/363/files#r6253436>
> .
>