Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Debian User (http://www.linux-archive.org/debian-user/)
-   -   git-svn and git tags (http://www.linux-archive.org/debian-user/234502-git-svn-git-tags.html)

Micha Feigin 01-26-2009 02:03 AM

git-svn and git tags
 
Is it possible to make git-svn work with git tags?

I tried tagging some commits in my local repository but once I did a
git-svn dcommit to upload my changes all the tags were killed (gitk doesn't
show any of them anymore). Is there a way to tag commits when working with
git-svn?

Also how does one work with branches in such a case. Is there a way to push
them also or does git-svn track trunk only and I need to merge in changes
before pushing them?

Thanks


--
To UNSUBSCRIBE, email to debian-user-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org

"Boyd Stephen Smith Jr." 01-26-2009 05:22 AM

git-svn and git tags
 
On Sunday 25 January 2009, Micha Feigin <michf@post.tau.ac.il> wrote
about 'git-svn and git tags':
>Is it possible to make git-svn work with git tags?
>
>I tried tagging some commits in my local repository but once I did a
>git-svn dcommit to upload my changes all the tags were killed (gitk
> doesn't show any of them anymore). Is there a way to tag commits when
> working with git-svn?

Normal git tags should work, just not in the way you want them to. Once
you dcommit something to the subversion server, git-svn fetches the new
revisions and updates the local commits that correspond. Actually,
commits are immutable so this can (and usually will) replace those commits
with new ones because the have a different SHA.

The git tag will continue to point at the old commits and there not an
automatic way to rewrite the tags to point to the new commits. You should
be able to see your tags in the output of 'git tag -l' and you should be
able to see them in gitk if your use 'gitk --all'.

I'm not sure the best way to interoperate with subversion tags in git-svn.

>Also how does one work with branches in such a case. Is there a way to
> push them also or does git-svn track trunk only and I need to merge in
> changes before pushing them?

Git branches and subversion branches are actually two very distinct beats,
but git-svn should be able to map them fairly well. If you use the
correct arguments to git-svn clone, it should create a git branch for each
subversion branch and it is possible to tell dcommit to push to a specific
branch.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss@iguanasuicide.net ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.net/ \_/


All times are GMT. The time now is 05:43 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.