git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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/
Next: Guilhem Bonnefille
Message 1 of 36 in “Howto use StGit and git-svn at same time”
  1. Guilhem BonnefilleJan 9, 2007
  2. Guilhem BonnefilleJan 9, 2007
  3. Yann DirsonJan 9, 2007
  4. Guilhem BonnefilleJan 15, 2007
  5. Rebasing stgit stacksYann Dirson, Jan 15, 2007
  6. Catalin MarinasJan 15, 2007
  7. Yann DirsonJan 15, 2007
  8. Catalin MarinasJan 16, 2007
  9. Yann DirsonJan 16, 2007
  10. Jakub NarebskiJan 16, 2007
  11. Karl HasselströmJan 17, 2007
  12. David KågedalJan 17, 2007
  13. Yann DirsonJan 17, 2007
  14. Yann DirsonJan 17, 2007
  15. Catalin MarinasJan 18, 2007
  16. Yann DirsonJan 18, 2007
  17. Jakub NarebskiJan 19, 2007
  18. Yann DirsonJan 20, 2007
  19. Jakub NarebskiJan 20, 2007
  20. Yann DirsonJan 20, 2007
  21. Catalin MarinasJan 22, 2007
  22. Catalin MarinasJan 18, 2007
  23. Yann DirsonJan 18, 2007
  24. Jakub NarebskiJan 19, 2007
  25. Catalin MarinasJan 22, 2007
  26. Yann DirsonJan 22, 2007
  27. Catalin MarinasJan 22, 2007
  28. Yann DirsonJan 23, 2007
  29. Catalin MarinasJan 23, 2007
  30. Yann DirsonJan 24, 2007
  31. Catalin MarinasJan 24, 2007
  32. Yann DirsonJan 24, 2007
  33. Theodore TsoJan 28, 2007
  34. Yann DirsonJan 28, 2007
  35. Catalin MarinasJan 28, 2007
  36. Yann DirsonJan 17, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.