Re: purpose of -r flag for git-svn fetch

From: Will Palmer <wmpalmer@gmail.com>
Date: Jun 30, 2010, 08:40 UTC
Message-ID: <1277887235.2498.31.camel@wpalmer.simply-domain>
In-Reply-To: <AANLkTil_iADth0dvcar-nkqjRcmK4p1Sc3UcBmXJ9nQn@mail.gmail.com>

On Tue, 2010-06-29 at 22:29 -0400, Bradley Wagner wrote:

Show 12 quoted lines

> I've tried doing git-svn fetch in batches because it takes too long to
> do it all at once.
> 
>     git svn -r1:5000 fetch
>     git svn -r5000:10000 fetch
>     git svn -r10000:15000 fetch
> 
> Strangely, after this is done if I look in the history with "git log",
> I only see commits on master branch up through the 5000th revision of
> the SVN repository. Someone told me to then call git-svn rebase to fix
> it. What does "-r" actually do when invoked on consecutive calls to
> "git-svn fetch" and why does git-svn rebase appear to fix it?

The keyword here is "fetch". "fetch" only retrieves data into the remote-tracking branch (often called refs/remotes/git-svn), without updating your local branches. "git svn rebase", on the other hand, rebases your currently-checked-out branch to be based on the git-svn remote ref. (note that "git svn rebase" does a "git svn fetch" behind-the-scenes first, and is actually just "git svn fetch" followed by a normal "git rebase")

The concepts are the same as if you were using the regular git commands "fetch" and "rebase", so the man pages for those may offer some insight.

Show 10 quoted lines

> 
> I posted this question to Stackoverflow before realizing that this
> list is a better audience for it:
> http://stackoverflow.com/questions/3144683/master-branch-missing-revisions-after-sequential-git-svn-fetch-calls
> 
> Thanks!
> --
> 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