Howto use StGit and git-svn at same time
- From
Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
- Date
- Jan 9, 2007, 21:35 UTC
- Message-ID
- <8b65902a0701091335u160c6dfl81a523e4cd5adbee@mail.gmail.com>
Hi,
I'm a newbie and I'm using: - git-svn to connect to a public SVN repo, - StGit to manage my patches for the project hosted by this repo.
The current GIT repo was previously cloned from a GIT repo made with git-cvsimport. But the project moved to SVN, so I removed the GIT repo connected to the CVS.
I succesfully fetch the SVN, create a "work" local branch (connected to remotes/trunk), and create some patches. As the SVN evolved, I wish to retrieve info and update my patches.
So I tried a "stg pull" whihc failed because "origin" no more exists. So, I tried a "git-rebase remotes/trunk". Is it correct?
I'm actually unable to conclude, as the maintainer apply my patches with some improves, so I have to solve lots of conflicts. But I would appreciate if you can confirm me that the git-rebase is the good way to update a "workspace" managed both by git-svn and StGit.
-- Guilhem BONNEFILLE -=- #UIN: 15146515 JID: guyou@im.apinc.org MSN: guilhem_bonnefille@hotmail.com -=- mailto:guilhem.bonnefille@gmail.com -=- http://nathguil.free.fr/