[EMAIL PROTECTED] wrote:
> Well, I would have guessed it would work because your local git
> directory knows that the v0_8-branch is your corrent branch.
>
I'm not so sure that my local Git repository knows that v0_8-branch is
my current branch. Let me explain how my Git repository came into being.
I more or less sequentially followed A tutorial introduction to git
<http://www.kernel.org/pub/software/scm/git/docs/tutorial.html>. I
started with what I had in my CVS repository.
jesus% cd ~/git/
jesus% cvs -d :ext:[EMAIL PROTECTED]:/var/lib/cvsroot export -ko -D
2007-07-06 icarus_verilog
...
jesus% cd icarus_verilog/
jesus% git init
Initialized empty Git repository in .git/
jesus%
Although my notes don't show these steps explicitly, I must have next done
jesus% git add .
jesus% git commit
Then the tutorial tried to teach me about making changes, so I decided
to do some real Icarus Verilog development (i.e. latch synthesis) before
coming back to the Git tutorial. I made some necessary file
modifications and added their updated contents to the index. After
verifying that Icarus Verilog behavior was at least no worse, I
committed my changes.
At that point I thought it wise to get in sync with the v0_8-branch of
/your/ Git repository. I read about Alice and Bob in the tutorial, but
considered where I was and where I wanted to go. I came up with
jesus% git pull git://icarus.com/~steve-icarus/verilog v0_8-branch
warning: no common commits
remote: Generating pack...
remote: Done counting 18563 objects.
remote: Deltifying 18563 objects...
remote: 100% (18563/18563) done
Indexing 18563 objects...
remote: Total 18563 (delta 14592), reused 17499 (delta 13815)
100% (18563/18563) done
Resolving 14592 deltas...
100% (14592/14592) done
Auto-merged Attrib.cc
CONFLICT (add/add): Merge conflict in Attrib.cc
...
Automatic merge failed; fix conflicts and then commit the result.
jesus%
There seemed to be a conflict on every file, probably an artifact of my
suppression of keyword expansion in CVS. I resolved all of the
conflicts, then added the updated contents of each of these files to the
index, verified Icarus Verilog, and committed again. Some time had
passed (other priorities, you know) so I pulled again.
jesus% git pull git://icarus.com/~steve-icarus/verilog v0_8-branch
Already up-to-date.
jesus%
At this point, I'm ready to create a patch.
Note that I never did clone.
Also, the pulls were the only reference to "v0_8-branch". From your
point of view, I'm contributing to v0_8-branch. From my point of view,
this is my main line of development. After you merge v0_8-branch to your
trunk, if I'm still developing Icarus Verilog, I would simply pull from
your trunk instead. At that time I would expect a large merge (or a
large update, depending on how much work I'm doing at that time).
What is needed is a way to specify your repository and branch while
creating the patch. It's simply a difference between heads.
--
Alan Feldstein
Cosmic Horizon logo
http://www.alanfeldstein.com/
+1 585 415 6682
_______________________________________________
geda-dev mailing list
[email protected]
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
