On Mon, 2007-01-15 at 20:20 +, Keith Whitwell wrote:
Michel Dänzer wrote:
On Mon, 2007-01-15 at 17:35 +, Keith Whitwell wrote:
So, I decided it would be neat to merge all the changes that have
occurred on the Mesa mainline to the vbo branch where I've started
working again.
Naively, I thought something simple like:
git checkout vbo_0_1_branch
git pull
Would do the trick,
It should.
but that has given me a gazillion conflicts in crazy
places like the svga driver and what-have-you. Presumably some of these
are artifacts of the CVS-git import and the fact that I'm playing on a
branch that was originally created under CVS and has been pulled in as
part of the import.
Indeed. E.g. git-pull says some files were added on both branches, which
is probably due to a CVS merge that wasn't properly converted into a git
merge.
What is the way forward? I'm pretty happy to create a new branch and
drop the code into that, if necessary, but I'd like to know that my
pulling problems will be over in that case.
They should be. If you want to preserve the history on the new branch,
you could try
git-format-patch -o /tmp origin
on the old branch to generate a patch series in /tmp and then
git-am /tmp/00*
on the new branch. Though that may end up requiring manual merging after
many of the commits.
If you know what branch was merged before the git conversion that's
causing you your pain, one way forward might be to do:
git-checkout master
git pull -s ours . that-merged-branch
git pull . my-branch
Basically, you're recovering from the lack of information in the CVS
merge commit by creating a new commit that records that
that-merged-branch was merged, while making no changes to master since
it was already merged. (After that step, I would run git-diff HEAD
HEAD~1 to make sure it actually didn't result in any changes).
I haven't actually tested this proposal to make sure it would work, so
YMMV.
Oh yes, and there is some magic to create a branch on the remote, right?
Am I able to do this myself or to I have to ask a grownup?
git push origin branchname:branchname
--
Eric Anholt [EMAIL PROTECTED]
[EMAIL PROTECTED] [EMAIL PROTECTED]
signature.asc
Description: This is a digitally signed message part
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV___
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
