Re: Re: Re: merging advice request

On 30 December 2014 at 22:13, Mr. User One <mr.user1_at_hotmail.com> wrote:

> > (a) You could probably use the git-svn interface
> > OR
> > (b) you can turn your working copy into a git repository
>
> (b) I could turn the local repo into a git repo, but I obviously cannot do
> that with the project repo. So I could only git-branch my own repo, which
> has no use.
> Or did I miss something?
>

Please use the correct terminology, otherwise it is confusing for everyone.
Git has local repositories which are identical to any 'master' repository
and which carry the complete history. Subversion does not. There is one
central repository which is just a database, and the users have working
copies which contain a snapshot of the file tree in the repository (usually
the newest revision) but none of the history. There is a big difference
between a repository and a working copy.

(a) This looked promising at first, thank you. Unfortunately, after a
> closer look, it boiled down to be the same as (b). Git is just capable of
> creating svn branches, and to import those, nothing more than that.
>
>
If you have no commit access to the repository and are only creating and
maintaining a local variant, I think you need to look at what subversion
calls vendor branches.

http://svnbook.red-bean.com/en/1.8/svn.advanced.vendorbr.html

It's a bit of a manual process at the moment to maintain them but I believe
there are enhancements on the way for TortoiseSVN 1.9.

Simon

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3093608

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-12-31 10:59:04 CET