Re: git for subversion users
Show 20 quoted lines
> It would be nice if git-svn could also fake setting
> remote merge properties, too.
>
> Some beginnings at:
>
> http://git.catalyst.net.nz/gw?p=git.git;a=shortlog;h=svk-merge
> (pull from git://git.catalyst.net.nz/git.git#svk-merge)
>
> What it needs to do;
>
> 0. preserve the notion that commits tagged with "git-svn-id:" should
> not vary depending on who synced them.
>
> 1. on commit, if we're committing a merge, make sure that the other
> parent has the same revision somewhere in the repo, and then set
> the "svk:merge" and "svnmerge-integrated" tags to accurately record
> which parent SVN revisions are used
>
> 2. when fetching revisions, spot these tickets and set parents
> appropriately.
Proof of concept for #2 at:
http://git.catalyst.net.nz/gw?p=git.git;a=commitdiff;h=816e2ef
Sam.