[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Need for a local Subversion server?

From: Andreas Krey <a.krey_at_gmx.de>
Date: Sun, 24 Jul 2011 13:27:38 +0200

On Sat, 23 Jul 2011 11:52:12 +0000, Stefan Sperling wrote:
> You can branch and merge locally in git, but all the git branches you
> create in the git repository cloned from svn usually map to one Subversion
> branch. If they don't then you need to add merges between branches
> to svn:mergeinfo when you push revisions to Subversion.
> This is possible with recent git-svn versions, but you have to manually
> pass the correct svn:mergeinfo value (the *full* value, not just the
> modifications your merge is creating!). .............. But manually
> computed mergeinfo can still be wrong even if it is syntactically correct.

And are very likely to get wrong. May it be possible to first do
the merge via git-svn, and then fix the mergeinfo with 'svn merge
(--reintegrate) --record-only'? One would need to 'git svn fetch' and
clean up afterwards, but have the advantages of git's merge algorithms.

> If your use of git-svn does not involve merging between Subversion
> branches it is probably safe.

I usually use git-svn for 'regular' in-branch work, and fall back to svn
for merges (the few I need to do).

Also git-svn comes in quite handy, along with gitk, to visualize branches
and merges in svn, and to simply see from where tags have been made
(trunk or some branch).

Is there some visualization that can do the same for svn natively,
for a whole tree (as opposed to single files).


"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800
Received on 2011-07-24 13:28:26 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.