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

Jakob Stoklund Olesen stoklund at 2pi.dk
Wed Jul 20 08:12:17 PDT 2011


On Jul 19, 2011, at 4:18 PM, NAKAMURA Takumi wrote:

> I don't think using "git-svn rebase -l" would be simple.
> git-svn stuff should be used to interact to svn repo.
> 
> It would be enough "git pull" instead of "git fetch origin; git svn rebase -l".
> (.rev_map is not needed to be up-to-date unless git-svn command would be used)

Good point.

If you can work with Jeffrey to come up with better instructions, that would be great.

Just make sure they are newbie-proof.

> At committing, git-svn rebase could be used.
> $ git svn rebase -l
> $ git svn dcommit
> Also git-svn dcommit can update .rev_map, We can use "git pull
> --rebase" instead of "git svn rebase -l".
> 
> BTW, setting up authorsfile might be pain, but it should reduce
> accidental undesirable committing by git-svn fetch. (Please consider,
> what would happen if "-l" were missed on executing "git-svn rebase"?)

For those who don't know, the problem is that 'git svn dcommit' will create a different local commit hash than the git mirror if the two log messages are not exactly identical. Since the log message includes the committer's name and email, those must be identical as well. After committing, you need to pull from the git mirror to get the canonical hash.

I don't like any solution that depends on using an author file. It is simply too fragile to try to produce the same SHA-1 on the server and locally by having identical author files.

Please make sure your instructions deal with that issue in a robust way.

Thanks,
/jakob





More information about the llvm-commits mailing list