From: Will Palmer <wmpalmer@gmail.com>
To: Bradley Wagner <bradley.wagner@hannonhill.com>
Cc: git@vger.kernel.org
Subject: Re: purpose of -r flag for git-svn fetch
Date: Wed, 30 Jun 2010 09:40:35 +0100 [thread overview]
Message-ID: <1277887235.2498.31.camel@wpalmer.simply-domain> (raw)
In-Reply-To: <AANLkTil_iADth0dvcar-nkqjRcmK4p1Sc3UcBmXJ9nQn@mail.gmail.com>
On Tue, 2010-06-29 at 22:29 -0400, Bradley Wagner wrote:
> 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.
>
> 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
next prev parent reply other threads:[~2010-06-30 8:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-30 2:29 purpose of -r flag for git-svn fetch Bradley Wagner
2010-06-30 8:40 ` Will Palmer [this message]
2010-06-30 13:32 ` Bradley Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1277887235.2498.31.camel@wpalmer.simply-domain \
--to=wmpalmer@gmail.com \
--cc=bradley.wagner@hannonhill.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).