Hi Sang-Min,
On 22/06/11 01:36, Sang-Min Park wrote:
Hi all,
I'm trying to commit a minor change in Eucalyptus driver. I learned that
"git svn" would do the job and followed the instruction here:
http://wiki.apache.org/general/GitAtApache.
However, I'm getting this error when I do "git svn rebase"
'git svn rebase' is how you pull in the latest code/changes from trunk.
to commit use 'git svn dcommit'. However, we always send patches to the
list for review before a commit to trunk, no matter how minor.
"Unable to determine upstream SVN information from working tree history"
don't know why you're seeing this... how did you create your git repo?
Can I use git svn to commit? If so, is there any step that I have to follow?
Thanks!
fwiw - here's my usual git workflow. I have a branch called 'master' and
then create branches for every different bit of functionality/fixes that
I'm working on:
<switch to master and fetch changes>:
git checkout master
git svn rebase
<make a branch and do your edits/changes/voodoo>:
git checkout -b my_new_branch
<make all your edits, once done check what you did/changed>:
git status
<commit your changes to your new branch, write a commit message>:
git commit -a
<change to master branch, fetch upstream changes that happened while you
were working on my_new_branch>:
git checkout master
git svn rebase
<rebase your my_new_branch from master>
git rebase master my_new_branch
<make some patches against the master branch and send them to the list>:
git format-patch -o /path/to/where/you/keep/patches/ master
git send-email --compose --subject 'some subject' --thread
/path/to/where/you/keep/patches/* --to [email protected]
Once your patches are reviewed/acked and you have made any changes you
can commit. At this point you should ALWAYS rebase against master since
things will have changed while you were waiting for a review:
git checkout master
git svn rebase
git rebase master my_new_branch
The rebase above will also switch to my_new_branch, and then you commit
with:
git svn dcommit
There is LOTS of info online about git, and I do not claim that the
above is the best/only way to work, its just what I do. I sometimes
refer to http://cheat.errtheblog.com/s/git please ping me on irc for
any doubts/questions
marios
Sang-min
Engineer,
Eucalyptus Systems
