[fdo-internals] RE: Random question
Chris Erickson
chris at cartopac.com
Fri Mar 6 12:53:52 EST 2009
I would just think a place to create branches would be useful.
Here's what we have internally:
trunk
tags
Build x
Build x + 1
...
branches
3.0
3.1
...
TestNewFunctionalityX
LongTermEnhancementY
FixForDefectXXXThatCantBeMergedUntilAfterRelease
This gives the flexibility so that:
1) If I need to work on a piece of functionality for a while, I can do so without disturbing trunk
2) I can isolate myself from other's changes on a branch while I'm working on something, the merge their changes once I'm ready to go back to trunk
3) I can work on something, then switch back to trunk to do something else, then back to my working branch
4) I could check in a fix for a defect that wouldn't fit into the 3.4 release, but it would be nice to get the fix in version control (so I don't lose/break it) and it can sit there until it is ready to be merged after the release...
5) If I have code or modifications that I've made, that are not part of FDO, I could be on my own branch, and merge FDO changes to my branch to keep my branch up-to-date with the newest FDO updates.
I thought in concept that that is what the sandbox was, but it is only a single branch and therefore wouldn't provide this flexibility...
chris erickson
developer
chris at cartopac.com
970.493.9500 x 191
970.482.1485 (fax)
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org [mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Greg Boone
Sent: Friday, March 06, 2009 10:48 AM
To: FDO Internals Mail List
Subject: RE: [fdo-internals] RE: Random question
I am not sure we need a sandbox per user. What is the benefit?
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org [mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Jason Birch
Sent: Friday, March 06, 2009 12:45 PM
To: FDO Internals Mail List
Subject: RE: [fdo-internals] RE: Random question
That would be useful.
Currently, sandbox is itself a branch, but it would be better if this
could be done per-user, and then have branches under each user. For
collaborative projects, branches could be placed directly under sandbox
like /sandbox/mac-os.
Here are examples from MapGuide, GDAL, MapServer where it is done like
this:
http://svn.osgeo.org/mapguide/sandbox/
http://svn.osgeo.org/gdal/sandbox/
http://svn.osgeo.org/mapserver/sandbox/
Jason
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Chris
Erickson
Sent: March-06-09 9:35 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
Can anybody explain the 'sandbox' etc? Can I create a branch to checkin
my fixes on, and once they're tested and approved, then move them back
to trunk?
chris erickson
developer
chris at cartopac.com
970.493.9500 x 191
970.482.1485 (fax)
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Greg Boone
Sent: Friday, March 06, 2009 9:52 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
Done.
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Chris
Erickson
Sent: Friday, March 06, 2009 11:49 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
chriserickson
chris erickson
developer
chris at cartopac.com
970.493.9500 x 191
970.482.1485 (fax)
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Greg Boone
Sent: Friday, March 06, 2009 9:48 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
If you sent in the agreement then I can flip the switch to give you
commit rights. What is your OSGeo user name?
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Chris
Erickson
Sent: Friday, March 06, 2009 11:35 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
I sent in our agreement, but I don't have commit rights that I know of.
chris erickson
developer
chris at cartopac.com
970.493.9500 x 191
970.482.1485 (fax)
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Greg Boone
Sent: Friday, March 06, 2009 9:28 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
Yes, You can attach a patch to the defect and you can submit it once the
3.4.0 branch is created.
Do you have commit rights yet? Have you sent in your signed OSGeo
agreement?
Greg
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Chris
Erickson
Sent: Friday, March 06, 2009 11:25 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
Can I just submit a patch for it, and it can be put in later?
chris erickson
developer
chris at cartopac.com
970.493.9500 x 191
970.482.1485 (fax)
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Greg Boone
Sent: Friday, March 06, 2009 9:08 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
I do not consider this a stop ship issue. Please do not change this for
3.4.0. This should be a candidate for 3.4.0 + 1 of a patch.
Greg
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Chris
Erickson
Sent: Friday, March 06, 2009 10:59 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
Can I fix it?
chris erickson
developer
chris at cartopac.com
970.493.9500 x 191
970.482.1485 (fax)
-----Original Message-----
From: fdo-internals-bounces at lists.osgeo.org
[mailto:fdo-internals-bounces at lists.osgeo.org] On Behalf Of Romica
Dascalescu
Sent: Friday, March 06, 2009 8:18 AM
To: FDO Internals Mail List
Subject: [fdo-internals] RE: Random question
It's just a bug :)
Romy.
________________________________
From: fdo-internals-bounces at lists.osgeo.org
[fdo-internals-bounces at lists.osgeo.org] On Behalf Of Chris Erickson
[chris at cartopac.com]
Sent: Friday, March 06, 2009 9:35 AM
To: FDO Internals Mail List
Subject: [fdo-internals] Random question
Can anyone tell me why ByteArrayToFdoByteArray(System::Byte mgBuffer
__gc[]) in CommonUtilities.h copies the unmanaged byte array rather than
just pinning it?
[cid:image001.png at 01C99E2E.13ABA4F0]<http://www.cartopac.com/>
chris erickson
developer
chris at cartopac.com<mailto:chris at cartopac.com>
970.493.9500 x 191
970.482.1485 (fax)
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
_______________________________________________
fdo-internals mailing list
fdo-internals at lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-internals
More information about the fdo-internals
mailing list