login
Header Space

 
 

Howto use StGit and git-svn at same time

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <git@...>
Date: Tuesday, January 9, 2007 - 5:35 pm

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/
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Howto use StGit and git-svn at same time, Guilhem Bonnefille, (Tue Jan 9, 5:35 pm)
Re: Howto use StGit and git-svn at same time, Guilhem Bonnefille, (Tue Jan 9, 5:41 pm)
Re: Howto use StGit and git-svn at same time, Yann Dirson, (Tue Jan 9, 6:41 pm)
Re: Howto use StGit and git-svn at same time, Guilhem Bonnefille, (Mon Jan 15, 9:26 am)
Rebasing stgit stacks, Yann Dirson, (Mon Jan 15, 4:24 pm)
Re: Rebasing stgit stacks, Catalin Marinas, (Mon Jan 15, 6:46 pm)
Re: Rebasing stgit stacks, Yann Dirson, (Mon Jan 15, 7:39 pm)
Re: Rebasing stgit stacks, Yann Dirson, (Wed Jan 17, 5:30 pm)
Re: Rebasing stgit stacks, Catalin Marinas, (Tue Jan 16, 6:42 pm)
Re: Rebasing stgit stacks, Yann Dirson, (Tue Jan 16, 7:17 pm)
Re: Rebasing stgit stacks, Catalin Marinas, (Thu Jan 18, 5:05 am)
Re: Rebasing stgit stacks, Yann Dirson, (Thu Jan 18, 4:52 pm)
speck-geostationary