[fpc-devel] RTTI

[Steve Hildebrandt]

Am 24.08.2015 um 19:46 schrieb Jonas Maebe:
> On 24/08/15 19:30, Steve Hildebrandt wrote:
>> already did the changes but have jet to find the time to integrate them
>> in the branch.
>> Currently they are only in a local git branch.
>> What would be the best approach concerning a "svn rebase" ?
> Rebasing a publicly published branch is generally not a good idea (even
> when using pure git), because it invalidates all local changes that
> other people might have. So either you create a new branch in which
> these rebased changes go, or instead you merge the changes, make your
> changes (which may consist of just copying over the results from your
> rebase and then adding the file) and commit.
>
> Note that when merging using git-svn, you must add the following to your
> ~/.gitconfig or in .git/config of the clone:
>
> [svn]
> 	pushmergeinfo = true
>
> Additionally, merge with "--no-ff". If you do those two things (and
> don't rebase afterwards), git-svn will properly update the svn merge
> information in the remote repository.
>
>
> Jonas
I did a rebase only for my local branch.
So it is easy to merge the svn branch.
I don't want to use svn-git since I'm neither confident everything is 
setup right nor will end up the way I want it to.
The local git is more or less only a playground for me.
But since I already did the work there it should be easy to do a merge 
in the RTTI branch.
What I wanted to know is, in which way can I integrate the current svn 
trunk in the RTTI branch, preventing headache for anyone using it.

Steve