On Fri, Jun 6, 2008 at 3:07 PM, davetron5000 <davetron5000@xxxxxxxxx> wrote: > I was given a branch in an SVN repo to work on. My plan is to merge > it with trunk in Git to indicate how much easier it would be to use > Git. > > Unfortunately, Git doesn't seem to realize that my branch is a branch > from SVN's trunk. For example, I have made no changes to file foo.c > > The main trunk has changes to foo.c > > When I merge, those changes show up as conflicts. > > gitk doesn't show any branch points, and I'm thinking that Git just > doesn't see the branches as they are in SVN. How much history did you fetch from subversion? If you didn't fetch at least to the branch point, then that could explain what you're seeing. If the SVN repository isn't too large, it is probably worth the time to fetch the entire history (from r1 forward). > The sha-1 of the branch commit from SVN shows up in gitk when I've > checked out my branch, but not if I have the trunk checked out (though > a git log DOES show it). That's expected; it sounds like you want "gitk --all" -- -Steven Walter <stevenrwalter@xxxxxxxxx> "A human being should be able to change a diaper, plan an invasion, butcher a hog, conn a ship, design a building, write a sonnet, balance accounts, build a wall, set a bone, comfort the dying, take orders, give orders, cooperate, act alone, solve equations, analyze a new problem, pitch manure, program a computer, cook a tasty meal, fight efficiently, die gallantly. Specialization is for insects." -Robert Heinlein -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
