[Geany-devel] Devhelp integration plugin

[Chow Loong Jin]

On Tuesday 08,March,2011 11:26 PM, Matthew Brush wrote:
> On 03/08/11 06:15, Frank Lanitz wrote:
>> Am 06.03.2011 14:01, schrieb Thomas Martitz:
>>> Am 06.03.2011 13:36, schrieb Enrico Tröger:
>>>>> 2) Is it possible to continue using Git (on GitHub) and still commit
>>>>> to geany-projects SVN at the same time (when code on Git is good
>>>>> enough to go into the official Projects SVN)?  I'm pretty new with VCS
>>>> Why not.
>>>> I'd say it's your business how you organise your development cycle. If
>>>> you prefer to use mainly GIT and use the Geany-Plugins repository to
>>>> put in some more matured code, why not.
>>>> Just be aware, most of the Geany-Plugins users will use the SVN
>>>> repository, I guess.
>>>
>>> Indeed. You can continue using git and use git-svn to commit to the g-p
>>> svn repo whenever you feel it's the right time.
>> This might will create some issues with build system etc. but in general
>> you are right.
>>
> I've been using git-svn for a few commits now and it seems to be working OK,
> please correct me if I've been causing problems yet :)
> 
> I've been doing normal Git where I make a branch to work on a specific thing,
> then merging into master branch.  When I'm done making commits/merges, then I
> use 'git svn rebase' to resync with SVN and then doing a 'git svn dcommit' to
> push the commits to SVN.  I added a .gitignore file containing a list of all the
> Autotools cruft and other files that change when configuring and building, and I
> also added .gitignore to the .gitignore so I don't accidentally put that file in
> SVN.

You could actually use .git/info/exclude instead for that functionality. Then
you can use stuff like git clean -fdx, and not worry about accidentally purging
your .gitignore. .gitignore should only be used if you want to commit it into
the repository.

-- 
Kind regards,
Loong Jin

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 900 bytes
Desc: OpenPGP digital signature
URL: <http://lists.geany.org/pipermail/devel/attachments/20110313/d7dae50b/attachment.pgp>