Skip to contentSkip to conversation

git-svn and working with tags

DISCUSSION Nicolas Vilz 'niv' 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

Hi guys,

I am about to use a git/svn construct for a project next week to track my work and the work of my co-workers.

Reason for this is, that all the others are working on windows-boxes and I am the lonesome gunman, who wants to work with git on a linux box contributing the others on svn side.

There is still a lot of work todo, preparing both backends, git and svn, for serving almost the same content structure.

I think, i can do a little scripting to switch my git-SVN-HEAD to another branch. But how am i intended to export tags to svn?

tags should simply go to <repos>/tags/<tagname>
branches go to <repos>/branches/<branchname>
master goes to <repos>/trunk

A svn-import should be no problem then. The re-exporting back to one branch or svn_path is described in git-svn howto. but how about tags?

do i have to consider the tags on svn-side manually?

any ideas/hints?

Sincerly
Nicolas

#1 lore raw
Quoted 15 lines · Nicolas Vilz 'niv

Hi guys,

I am about to use a git/svn construct for a project next week to track my work and the work of my co-workers.

Reason for this is, that all the others are working on windows-boxes and I am the lonesome gunman, who wants to work with git on a linux box contributing the others on svn side.

There is still a lot of work todo, preparing both backends, git and svn, for serving almost the same content structure.

I think, i can do a little scripting to switch my git-SVN-HEAD to another branch. But how am i intended to export tags to svn?

Quoted 8 lines

tags should simply go to <repos>/tags/<tagname>
branches go to <repos>/branches/<branchname>
master goes to <repos>/trunk

A svn-import should be no problem then. The re-exporting back to one branch or svn_path is described in git-svn howto. but how about tags?

do i have to consider the tags on svn-side manually?

You'll need to do tags on the svn-side manually. git-svn (by-design) has hardly any notion of SVN tags (they're really just branches designated as read-only). git-svn also fails to track directory copies [1], so using git-svn to track a higher-level directory and performing a copy in git and doing git-svn commit may not work so well.

You can make something that parses a git commit that was imported in git-svn-HEAD. These imported commits have a 'git-svn-id:' line at the end that can be parsed for URL and revision number, so you could make it frontend 'svn cp' pretty easily.

[1]: git-diff-* doesn't notice copied/renamed directories. I'm actually very thankful for this as it's very prone to bugs in my experience.

Signature · 1 line
Eric Wong