Humh... I finished the conflicts solving game. I think the way I choosed is incorrect. Following gitk, it is now a big big bazaar in my commits history. Can you give me some tips about using both git-svn and stgit please? On 1/9/07, Guilhem Bonnefille <guilhem.bonnefille@xxxxxxxxx> wrote:
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@xxxxxxxxxxxx MSN: guilhem_bonnefille@xxxxxxxxxxx -=- mailto:guilhem.bonnefille@xxxxxxxxx -=- http://nathguil.free.fr/
-- Guilhem BONNEFILLE -=- #UIN: 15146515 JID: guyou@xxxxxxxxxxxx MSN: guilhem_bonnefille@xxxxxxxxxxx -=- mailto:guilhem.bonnefille@xxxxxxxxx -=- http://nathguil.free.fr/ - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html