Subject: Re: [ANN] SubGit Early Access Program Build #789

From: Semen Vadishev <[email-masked]>
Date: Wed, 23 Nov 2011 18:19:32 +0100

Hello Andreas,

> How does it handle merges?
The short answer is

1. git to svn: SubGit sets svn:mergeinfo accordingly to
the history of merged parent(s).

2. git to svn: SubGit checks whether modified svn:mergeinfo includes 
the history of a certain branch, if so it adds this branch as a merge 
parent.

For more details please refer to
http://subgit.com/documentation/spec/merge.pdf — it's a part of SubGit
specification related to the merge-tracking stuff.

Semen Vadishev,
TMate Software,
http://subgit.com/ - Two Way Ticket to The Dark Side

On 23 November 2011 10:03, Andreas Ericsson wrote:
> On 11/22/2011 08:15 PM, Semen Vadishev wrote:
>> Hello All,
>>
>> Let me introduce our new project: SubGit (http://subgit.com/).
>>
>> SubGit is a tool for smooth migration from Subversion to Git. As well as
>> from Git to Subversion. Without git-svn insanity.
>>
>> It works like this:
>>
>> - Install SubGit into your repository on the server side
>>
>> - Let initial translation complete (time depends on the size of repository)
>>
>> - SubGit installs hooks into repository, so it translates every svn
>> revision and git commit
>>
>> - Committers may now use either Git or Subversion (or both) with the
>> tools of their choice
>>
> How does it handle merges?
>