Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jgit-dev] [ANN] SubGit Early Access Program Build #789

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 

For more details please refer to — it's a part of SubGit
specification related to the merge-tracking stuff.

Semen Vadishev,
TMate Software, - 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 (
>> 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?

Back to the top