From: davetron5000 <davetron5000@gmail.com>
Date: Mon, 09 Jun 2008 19:54:41 GMT
Subject: Re: How does git store branchpoints?
Message-ID: <fd42f577-60ba-4d26-85a3-7ca4ea8295db@a1g2000hsb.googlegroups.com>
In-Reply-To: <m3hcc2wso1.fsf@localhost.localdomain>


>
> You can ask git to find branch point using "git merge-base trunk FOO",
> which should return 'c' (actually, sha-1 of this commit).

OK, this revealed interesting results.  The commit it gave me was a
commit right before ANOTHER SVN branch that I was originally to work
on, but never did.  The files git-merge showed conflicts for were
files modified since THAT branch (call it BAR) was created and before
my branch (FOO) was created.

So, any ideas why git thinks that my two branches are rooted at BAR
and not FOO?  git-svn dcommit on local-FOO commits to FOO and not BAR.

Dave