git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git for subversion users

From
Sam Vilain <sam@vilain.net>
Date
Jun 26, 2007, 07:29 UTC
Message-ID
<4680C057.5070202@vilain.net>
In-Reply-To
<4680AA15.6040501@vilain.net>
Sam Vilain wrote:
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.
Previous: Sam VilainNext: Patrick Doyle
Message 5 of 8 in “git for subversion users”
  1. Patrick DoyleJun 25, 2007
  2. Sam VilainJun 26, 2007
  3. Steven GrimmJun 26, 2007
  4. Sam VilainJun 26, 2007
  5. Sam VilainJun 26, 2007
  6. Patrick DoyleJun 26, 2007
  7. Alexander LitvinovJun 26, 2007
  8. subversion and merging [was: Re: git for subversion users]Sam Vilain, Jun 26, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.