<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
Greg,<br>
<br>
The old repositories should be ok, but don't use the trunk. Note that <b><a class="moz-txt-link-freetext" href="http://svn.osgeo.org/svn/fdo">http://svn.osgeo.org/svn/fdo</a></b>
is now <b><a class="moz-txt-link-freetext" href="http://svn.osgeo.org/svn/fdo32x">http://svn.osgeo.org/svn/fdo32x</a></b>. The new repository is
called fdo, but has some issues. Shawn is still working on it.<br>
<br>
Bob<br>
<br>
Greg Boone wrote:
<blockquote
cite="mid4187BAA24A3D094F925AEE0BE39B7077054473F7@msgusaemb01.autodesk.com"
type="cite">
<pre wrap="">Please let everyone know when the repository is re-opened for commits.
Greg
-----Original Message-----
From: shawn barnes [<a class="moz-txt-link-freetext" href="mailto:sbarnes@dmsolutions.ca">mailto:sbarnes@dmsolutions.ca</a>]
Sent: Tuesday, January 30, 2007 11:38 AM
To: Greg Boone
Cc: Robert Bray; FDO Internals Mail List
Subject: Re: [fdo-internals] SVN Repository Merge Issues
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
The repositories are up but, commits are locked out until i'm done the
merge.
shawn
Greg Boone wrote:
</pre>
<blockquote type="cite">
<pre wrap="">Are the 3.2.x branches still open for submissions?
-----Original Message-----
From: shawn barnes [<a class="moz-txt-link-freetext" href="mailto:sbarnes@dmsolutions.ca">mailto:sbarnes@dmsolutions.ca</a>]
Sent: Tuesday, January 30, 2007 8:59 AM
To: Robert Bray
Cc: Greg Boone; FDO Internals Mail List
Subject: Re: [fdo-internals] SVN Repository Merge Issues
Bob,
I'm starting the merge now.
I'm pulling a complete backup of the repositories now (9am EST) and
</pre>
</blockquote>
<pre wrap=""><!---->then
</pre>
<blockquote type="cite">
<pre wrap="">take the repositories down.
Merge everything and then put everything backup including the new
</pre>
</blockquote>
<pre wrap=""><!---->merged
</pre>
<blockquote type="cite">
<pre wrap="">repository.
Question on naming. What is the name of the new merged repository?
(repository names can be easily changed)
shawn
Robert Bray wrote:
</pre>
<blockquote type="cite">
<pre wrap="">Great, thanks Greg! Shawn can you proceed with the merge tomorrow?
Thanks,
Bob
Greg Boone wrote:
</pre>
<blockquote type="cite">
<pre wrap="">The Merges from 3.2.x -> Trunk should now be complete in all FDO SVN
</pre>
</blockquote>
</blockquote>
<pre wrap="">repositories.
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap="">
Greg
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->------------------------------------------------------------------------
</pre>
<blockquote type="cite">
<pre wrap="">--------
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap="">*From:* Robert Bray [<a class="moz-txt-link-freetext" href="mailto:rbray@robertbray.net">mailto:rbray@robertbray.net</a>]
*Sent:* Sunday, January 28, 2007 2:41 AM
*To:* Greg Boone
*Cc:* FDO Internals Mail List; Shawn Barnes
*Subject:* Re: [fdo-internals] SVN Repository Merge Issues
We only have three more days of Shawn full time, so I would like to
</pre>
</blockquote>
</blockquote>
<pre wrap="">get this
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap="">done before he moves on to other things.
Bob
Greg Boone wrote:
Hi Bob,
We are still porting a few defects from 3.2.x -> trunk. I would like
</pre>
</blockquote>
</blockquote>
<pre wrap="">to
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap="">complete this process before we perform the merge.
Greg.
-----Original Message-----
*From:* Robert Bray [<a class="moz-txt-link-freetext" href="mailto:rbray@robertbray.net">mailto:rbray@robertbray.net</a>]
*Sent:* Sat 1/27/2007 3:01 AM
*To:* FDO Internals Mail List
*Cc:* Greg Boone; Shawn Barnes
*Subject:* Re: [fdo-internals] SVN Repository Merge Issues
This does not look too bad, but to save ourselves the hassle
</pre>
</blockquote>
</blockquote>
<pre wrap="">let's just
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> stick with plan A. Until further notice please avoid submitting
</pre>
</blockquote>
</blockquote>
<pre wrap="">anything
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> to trunk.
Shawn, can you plan to create the new FDO SVN repository on
</pre>
</blockquote>
</blockquote>
<pre wrap="">Monday by
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> merging all of the fdoXXX trunks?
Thanks,
Bob
Greg Boone wrote:
Hi all,
At this point, we have identified the following code submissions
</pre>
</blockquote>
</blockquote>
<pre wrap="">that
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> were made in the trunk and not in 3.2.x
603
628
652
Details...
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->------------------------------------------------------------------------
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> r603 | brentrobinson | 2006-12-18 10:09:39 -0500 (Mon, 18 Dec
</pre>
</blockquote>
</blockquote>
<pre wrap="">2006) | 1
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> line
Changed paths:
M /trunk/Fdo/Unmanaged/Common.vcproj
M /trunk/Fdo/Unmanaged/Fdo.vcproj
A /trunk/Fdo/Unmanaged/Inc/Common/Compare.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/ByteValue.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/DataValue.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/DateTimeValue.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/DecimalValue.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/DoubleValue.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/Int16Value.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/Int32Value.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/Int64Value.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/SingleValue.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/StringValue.h
M /trunk/Fdo/Unmanaged/Inc/Fdo/Schema/MergeContext.h
M
</pre>
</blockquote>
</blockquote>
<pre wrap="">/trunk/Fdo/Unmanaged/Inc/Fdo/Schema/PropertyValueConstraint.h
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> M
</pre>
</blockquote>
</blockquote>
<pre wrap="">/trunk/Fdo/Unmanaged/Inc/Fdo/Schema/PropertyValueConstraintList.h
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> M
</pre>
</blockquote>
</blockquote>
<pre wrap="">/trunk/Fdo/Unmanaged/Inc/Fdo/Schema/PropertyValueConstraintRange.h
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> M /trunk/Fdo/Unmanaged/Inc/FdoCommon.h
M /trunk/Fdo/Unmanaged/Inc/Makefile.am
M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/ByteValue.cpp
M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/DataValue.cpp
M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/DateTimeValue.cpp
M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/DecimalValue.cpp
M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/DoubleValue.cpp
A
</pre>
</blockquote>
</blockquote>
<pre wrap="">/trunk/Fdo/Unmanaged/Src/Fdo/Expression/ExpressionInternal.cpp
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> A
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->/trunk/Fdo/Unmanaged/Src/Fdo/Expression/ExpressionInternal.h
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/Int16Value.cpp
M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/Int32Value.cpp
M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/Int64Value.cpp
M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/SingleValue.cpp
M /trunk/Fdo/Unmanaged/Src/Fdo/Expression/StringValue.cpp
M /trunk/Fdo/Unmanaged/Src/Fdo/Makefile.am
M
</pre>
</blockquote>
</blockquote>
<pre wrap="">/trunk/Fdo/Unmanaged/Src/Fdo/Schema/DataPropertyDefinition.cpp
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> M /trunk/Fdo/Unmanaged/Src/Fdo/Schema/MergeContext.cpp
M
</pre>
</blockquote>
</blockquote>
<pre wrap="">/trunk/Fdo/Unmanaged/Src/Fdo/Schema/PropertyValueConstraintList.cpp
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> M
</pre>
</blockquote>
</blockquote>
<pre wrap="">/trunk/Fdo/Unmanaged/Src/Fdo/Schema/PropertyValueConstraintRange.cpp
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> M /trunk/Fdo/Unmanaged/Src/Message/FDOMessage.mc
FDO342: Support SDF constraint update.
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->------------------------------------------------------------------------
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap="">
r628 | brentrobinson | 2007-01-12 17:38:53 -0500 (Fri, 12 Jan
</pre>
</blockquote>
</blockquote>
<pre wrap="">2007) | 1
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> line
Changed paths:
M /trunk/Fdo/Unmanaged/Inc/Fdo/Expression/DoubleValue.h
Removed circular friend reference
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->------------------------------------------------------------------------
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> r652 | brentrobinson | 2007-01-23 16:21:24 -0500 (Tue, 23 Jan
</pre>
</blockquote>
</blockquote>
<pre wrap="">2007) | 1
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> line
Changed paths:
M /trunk/Fdo/Unmanaged/Fdo.vcproj
M /trunk/Fdo/Unmanaged/Inc/Fdo/Raster/DataValueCollection.h
M
</pre>
</blockquote>
</blockquote>
<pre wrap="">/trunk/Fdo/Unmanaged/Inc/Fdo/Raster/IRasterPropertyDictionary.h
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> M /trunk/Fdo/Unmanaged/Inc/Fdo.h
Deprecated redundant Inc/Fdo/Raster/DataValueCollection.h.
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->------------------------------------------------------------------------
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap="">
-----Original Message-----
From: Greg Boone
Sent: Friday, January 26, 2007 10:15 AM
To: 'FDO Internals Mail List'
Cc: Shawn Barnes
Subject: RE: [fdo-internals] SVN Repository Merge Issues
In response to your question, "At this point in time, how
</pre>
</blockquote>
</blockquote>
<pre wrap="">different is
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> trunk and 3.2.x", the branch and trunk are mostly identical but
</pre>
</blockquote>
</blockquote>
<pre wrap="">not
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> totally identical. Our decision with branching 3.2.x was that
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->all
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> changes submitted into the 3.2.x branch should also be submitted
</pre>
</blockquote>
</blockquote>
<pre wrap="">into
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> the trunk. I will have to verify that this is the case. I will
</pre>
</blockquote>
</blockquote>
<pre wrap="">look into
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> this and get back to you.
I know of a couple of submissions that went into the trunk that
</pre>
</blockquote>
</blockquote>
<pre wrap="">did not
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> go into the 3.2.x branch. There were several by Brent R. that
</pre>
</blockquote>
</blockquote>
<pre wrap="">come
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> immediately to mind (See attached) One significant difference is
</pre>
</blockquote>
</blockquote>
<pre wrap="">that
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> Brent dropped a change in the trunk of FDO that changed binary
compatibility between the branch and trunk.
Greg
-----Original Message-----
From: <a class="moz-txt-link-abbreviated" href="mailto:fdo-internals-bounces@lists.osgeo.org">fdo-internals-bounces@lists.osgeo.org</a>
</pre>
</blockquote>
</blockquote>
<pre wrap=""><a class="moz-txt-link-rfc2396E" href="mailto:fdo-internals-bounces@lists.osgeo.org"><mailto:fdo-internals-bounces@lists.osgeo.org></a>
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> [<a class="moz-txt-link-freetext" href="mailto:fdo-internals-bounces@lists.osgeo.org">mailto:fdo-internals-bounces@lists.osgeo.org</a>] On Behalf Of
</pre>
</blockquote>
</blockquote>
<pre wrap="">Robert Bray
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> Sent: Friday, January 26, 2007 1:06 AM
To: FDO Internals Mail List
Cc: Shawn Barnes
Subject: Re: [fdo-internals] SVN Repository Merge Issues
Hmm,
No responses. So everyone is ok with this, everyone is
</pre>
</blockquote>
</blockquote>
<pre wrap="">dumbfounded and
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> shocked into silence, or?
Any better ideas for how to deal with this merge? We need to
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->make
</pre>
<blockquote type="cite">
<pre wrap="">a
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> decision and move forward.
At this point in time, how different is trunk and 3.2.x?
Bob
Robert Bray wrote:
</pre>
<blockquote type="cite">
<pre wrap=""> All,
Shawn has been tinkering with this and has been able to
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap="">successfully
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> merge trunk. However it looks like we will not be able to merge
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap="">the
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> branches. You can see a preview of the merged repository here:
<a class="moz-txt-link-freetext" href="http://test.osgeo.net/trac/fdo-merged/browser/">http://test.osgeo.net/trac/fdo-merged/browser/</a>.
Merging in SVN alters the revision numbers, which is why the
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap="">branch
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> merges do not work. Here is the summary from Shawn: "I've
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap="">searched and
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap="">
</pre>
</blockquote>
<pre wrap="">
</pre>
<blockquote type="cite">
<pre wrap=""> spoken with a few people on subversion merges and consensus is,
</pre>
</blockquote>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> branches and tags are broken on projects that are being merged
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap="">into
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> another project, due to the fact that the tag/branch repository
</pre>
</blockquote>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><!---->
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> specific and don't translate to a new repository structure."
So it looks like we may need to have an OLD COLLECTION OF
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap="">REPOSITORIES
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap="">
</pre>
</blockquote>
<pre wrap="">
</pre>
<blockquote type="cite">
<pre wrap=""> (3.2.x) and a NEW REPOSITORY (3.3.x and beyond). This is not
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap="">ideal but
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap="">
</pre>
</blockquote>
<pre wrap="">
</pre>
<blockquote type="cite">
<pre wrap=""> I do not know what else to do at this point.
Thoughts and ideas welcome?
Bob
_______________________________________________
fdo-internals mailing list
<a class="moz-txt-link-abbreviated" href="mailto:fdo-internals@lists.osgeo.org">fdo-internals@lists.osgeo.org</a>
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre wrap=""><a class="moz-txt-link-rfc2396E" href="mailto:fdo-internals@lists.osgeo.org"><mailto:fdo-internals@lists.osgeo.org></a>
</pre>
<blockquote type="cite">
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> <a class="moz-txt-link-freetext" href="http://lists.osgeo.org/mailman/listinfo/fdo-internals">http://lists.osgeo.org/mailman/listinfo/fdo-internals</a>
</pre>
</blockquote>
<pre wrap=""> _______________________________________________
fdo-internals mailing list
<a class="moz-txt-link-abbreviated" href="mailto:fdo-internals@lists.osgeo.org">fdo-internals@lists.osgeo.org</a>
</pre>
</blockquote>
</blockquote>
<pre wrap=""><a class="moz-txt-link-rfc2396E" href="mailto:fdo-internals@lists.osgeo.org"><mailto:fdo-internals@lists.osgeo.org></a>
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> <a class="moz-txt-link-freetext" href="http://lists.osgeo.org/mailman/listinfo/fdo-internals">http://lists.osgeo.org/mailman/listinfo/fdo-internals</a>
_______________________________________________
fdo-internals mailing list
<a class="moz-txt-link-abbreviated" href="mailto:fdo-internals@lists.osgeo.org">fdo-internals@lists.osgeo.org</a>
</pre>
</blockquote>
</blockquote>
<pre wrap=""><a class="moz-txt-link-rfc2396E" href="mailto:fdo-internals@lists.osgeo.org"><mailto:fdo-internals@lists.osgeo.org></a>
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre wrap=""> <a class="moz-txt-link-freetext" href="http://lists.osgeo.org/mailman/listinfo/fdo-internals">http://lists.osgeo.org/mailman/listinfo/fdo-internals</a>
</pre>
</blockquote>
</blockquote>
<pre wrap="">
</pre>
</blockquote>
<pre wrap=""><!---->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
iD8DBQFFv3RbhzE9g90MFjcRAha5AJ43VgdgAdo0RBptrl/g9EPQB9ytpACeOHCo
dvq+LGHNCW5nwFKCOi6SwjY=
=UEUH
-----END PGP SIGNATURE-----
</pre>
</blockquote>
<br>
</body>
</html>