On Tue, 25 Aug 2009 12:12:53 +0200
Graeme Geldenhuys grae...@opensoft.homeip.net wrote:
Just to let you all know, SubVersion branch fixes_2_4 is now available
in the Git mirror as branch fixes_2.4.
Thank you!
___
fpc-devel maillist -
Hi,
How does the FPC developers manage the 2.3.x (up coming 2.4) branch? Is
it similar to the the Lazarus fixes branch, where fixes are applied to
trunk and then merged back into fixes branch. Or does it more often
have it's own development fixes which are NOT available in trunk?
I ask because
On 25 Aug 2009, at 10:13, Graeme Geldenhuys wrote:
How does the FPC developers manage the 2.3.x (up coming 2.4) branch?
Is
it similar to the the Lazarus fixes branch, where fixes are
applied to
trunk and then merged back into fixes branch. Or does it more often
have it's own development
Graeme Geldenhuys schrieb:
Hi,
How does the FPC developers manage the 2.3.x (up coming 2.4) branch? Is
it similar to the the Lazarus fixes branch, where fixes are applied to
trunk and then merged back into fixes branch.
Yes.
Or does it more often
have it's own development fixes which
Jonas Maebe wrote:
Normally everything is committed first to trunk and then merged.
Excellent, this makes my job much easier. Thanks.
Regards,
- Graeme -
--
fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal
http://opensoft.homeip.net/fpgui/
Jonas Maebe wrote:
Normally everything is committed first to trunk and then merged.
Just to confirm, the branch I need to look at is fixes_2_4 correct?
Regards,
- Graeme -
--
fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal
http://opensoft.homeip.net/fpgui/
On 25 Aug 2009, at 11:12, Graeme Geldenhuys wrote:
Jonas Maebe wrote:
Normally everything is committed first to trunk and then merged.
Just to confirm, the branch I need to look at is fixes_2_4 correct?
Yes.
Jonas
___
fpc-devel maillist -
Graeme Geldenhuys wrote:
I ask because I would like to track the upcoming 2.4 branch in Git as
well as the 2.5.x (trunk) and just want to optimise my SubVersion - Git
sync scripts.
Just to let you all know, SubVersion branch fixes_2_4 is now available
in the Git mirror as branch fixes_2.4.
Graeme Geldenhuys schreef:
mirror or FPC. On your next pull, the fixes_2.4 will be pulled as
well. I am using cherry-pick to keep the fixes_2.4 in sync with
SubVersion
But still allows patches directly committed to the fixes_2.4 branch?
Vincent
___
Vincent Snijders wrote:
But still allows patches directly committed to the fixes_2.4 branch?
Yes, I will detect those and apply accordingly. This is why I asked how
the fixes branch is _normally_ handled. If svnmerge is used - it is
simply less effort for me. :-)
Sidebar:
The reason I use
Florian Klaempfl wrote:
For fixes_2_4 we use the native merge facilities of subversiob 1.5+
Ah, that explains the different format 'merge comment' in each commit
message. :-) As long as the commit message mentions merge and what
revision was merged, it makes things pretty easy for me.
11 matches
Mail list logo
