[llvm-commits] [PATCH] Document how to maintain a git-svn clone of the LLVM git repositories

[Jeffrey Yasskin]

On Mon, Jul 18, 2011 at 4:25 PM, Jakob Stoklund Olesen <stoklund at 2pi.dk> wrote:
>
> On Jul 18, 2011, at 4:14 PM, Jeffrey Yasskin wrote:
>
>> These instructions are based on
>> http://groups.google.com/group/llvm-dev/browse_thread/thread/33256daf28f0f18c/0449f6bce452e7b8?#0449f6bce452e7b8.
>> I don't actually know git well enough to know if they're right, but
>> they seem to work.
>
> I use:
>
>  git fetch -p origin

Should I add "-p origin" to the patch's fetch commands?

>  git update-ref refs/remotes/git-svn origin/master
>  git svn rebase -l
>
> instead of changing the svn-remote.svn.fetch setting, but I think both will work.

The nice thing about changing the svn-remote.svn.fetch setting when
setting up a client is that it removes one step from every update.

> I don't think 'git checkout master' is needed in the update script. In fact, I often use the above script to rebase arbitrary branches onto trunk.
>

Say someone has 'master -> branch1 -> branch2', and happens to have
branch2 checked out when they run the update script. Unless the script
includes `checkout master`, won't `svn rebase` break the inheritance
from branch1? Clearly people who know git well can tweak the scripts
as necessary, but I was hoping to write instructions that are pretty
safe for relative newbies like me.

Thanks for taking a look,
Jeffrey