[bt-devel] working with Git / SVN

[Jaak Ristioja]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 23.07.2010 20:11, Olaf Radicke wrote:
> Am Freitag, den 23.07.2010, 19:31 +0300 schrieb Jaak Ristioja:
>> On 23.07.2010 18:24, Olaf Radicke wrote:
>>> I am to work with 'pull' or better with 'rebase'?
>>
>> I'm not a very experienced git user, but I think 'rebase' will be
>> better.
>>
>> http://gitorious.org/bibletime/svn-trunk is just a mirror of the real
>> SVN repository and
>> it is updated using git-svn. Therefore we can't merge any of your
>> changes to the real SVN
>> repository like one would do with git.
> 
> If you pull from my git-repos in to
> http://gitorious.org/bibletime/svn-trunk and then commit from
> gitorious.org to sf.net i think, it's better i pull.
> 
> olaf <-- pull -- gitorious.org <-- 'svn rebase' -- sf.net
> olaf -- pull --> gitorious.org -- 'svn dcommit' --> sf.net
> olaf <-- pull -- gitorious.org <-- 'svn rebase' -- sf.net
> 
> If i commit directly to sf.net, then it's better i make 'rebase'.
> 
> olaf <-- rebase -- gitorious.org <-- 'svn rebase' -- sf.net
> olaf -- 'svn dcommit' --> sf.net
> olaf <-- rebase -- gitorious.org <-- 'svn rebase' -- sf.net
> 
> In first way, you have the conflicts. In second way - i have the
> conflicts...

Well the whole point of the BibleTime svn-trunk repository at gitorious is to mirror the
SVN trunk, therefore I won't pull into svn-trunk from anywhere else.

So it must to be the second way. From time-to-time you can ask us to review the code you
have developed. If we decide that its something worth to merging into trunk, we'll finally
give you SVN commit access.

If, during your development, you have patches for other parts of BibleTime, please send
these to us. We will review them, commit them to SVN, and give you the credit. This helps
us to start trusting you and eventually accept you to our team, and give you SVN access.

To tell you the truth, I'm a bit skeptical about your new GUI project right now. I think
its risky because the code quality of the backend still needs a lot of refactoring and
some architectural changes. Personally, I'm concentrating on making the backend better, so
that the code would be more attractive to developers (e.g. easier to use, modify, enhance
etc).

Blessings!
Jaak

PS: You can also join us on the #bibletime channel on the FreeNode IRC network.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)

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
gHLk9jJxytWaohAgAEiH
=YE/P
-----END PGP SIGNATURE-----