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

Re: git-svn, remote tracking branch question

From
EWEric Wong <normalperson@yhbt.net>
Date
Mar 27, 2007, 22:00 UTC
Message-ID
<20070327220015.GA16344@untitled>
In-Reply-To
<m2ps6usa9o.fsf@ziti.fhcrc.org>
Seth Falcon <sethfalcon@gmail.com> wrote:
Show 27 quoted lines
> Hi,
> 
> I've edited my <repos>/.git/config file so that git-svn is tracking
> the main devel line as well as a release branch of a project.  This
> seems to work well.
> 
> So I have:
> 
> [svn-remote "svn"]
> 	url = https://svn.url.com/root
> 	fetch = branches/release-2-5:refs/remotes/2.5
> 	fetch = trunk:refs/remotes/git-svn
> 
> I can checkout the 2.5 release branch like this:
> 
>    git checkout -b 2.5 remotes/2.5
> 
> But at this point, how do I ask git-svn to update it?  When working on
> the devel line, I can do 'git svn rebase' and I would like to do the
> same thing but relative to the branch.
> 
> Perhaps there is some config I can add so that I don't have to do:
> 
>    git svn fetch
>    git rebase remotes/2.5
> 
> That isn't so bad except for having to remember where you are...

'git svn rebase' should be capable auto-discovering the remote ref that you last branched from. I'm not sure if the '2.5' that's common in the remote ref and your local branch would cause ambiguity, however...

I'll look into this more when/if I have time tonight.
-- 
Eric Wong
Previous: Seth FalconNext: Seth Falcon
Message 2 of 5 in “git-svn, remote tracking branch question”
  1. Seth FalconMar 27, 2007
  2. Eric WongMar 27, 2007
  3. Seth FalconMar 28, 2007
  4. Eric WongMar 29, 2007
  5. Eric WongMar 31, 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.