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

Re: git svn rebase problem

From
Miles Bader <miles@gnu.org>
Date
May 19, 2009, 00:56 UTC
Message-ID
<buobpppq5av.fsf@dhlpc061.dev.necel.com>
In-Reply-To
<32541b130905181000v34d5fd6arcb662bff232cb81c@mail.gmail.com>
Avery Pennarun <apenwarr@gmail.com> writes:
>> Branches and git-svn don't mix.
>
> That's not exactly true: merging and git-svn don't mix.  But rebasing
> works fine.

I've given up on trying to maintain rigid consistency with svn -- git-svn's constant rebasing is just too painful -- and just cherry-pick everything between my "svn" branch and master, and use master in conjunction with better-behaved git-only branches. I often end up with the same commits in a different order on the two branches, but oh well, not much to do about that I suppose.

This means I often end up cherry-picking long sequences of commits, and need to deal with conflicts in these cp-sequences. For this reason, I often wish cherry-pick supported all the fancy features of rebase (multiple commits, nice handling of conflicts, -i, etc) -- after all rebasing is really just a special case of cherry-picking.

[I've tried on a shell-script implementation of such an extended cherry-pick, but soooo many little corner cases to deal with... maybe it'd be easier to try and generalize git-rebase...?]

-Miles
-- 
Conservative, n. A statesman enamored of existing evils, as opposed to a
Liberal, who wants to replace them with new ones.
Previous: Avery Pennarun
Message 6 of 6 in “git svn rebase problem”
  1. David H. Lynch J.rMay 15, 2009
  2. Avery PennarunMay 15, 2009
  3. John TapsellMay 16, 2009
  4. Matthias AndreeMay 18, 2009
  5. Avery PennarunMay 18, 2009
  6. Miles BaderMay 19, 2009

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.