You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by "Mark R. Diggory" <md...@latte.harvard.edu> on 2003/11/15 01:26:22 UTC
Mergin two cvs trees
Dirk,
Well, I've recovered the sandbox cvs tree up to where I deleted
everything in the sandbox, this is now under jakarta-commons/math and
looks ok to me. I have the following backups:
jakarta-commons-sandbox-math-original.tar
Original sandbox math tree with deletions prior to 11/1/03
jakarta-commons-math-original.tar
Original commons math tree with changes made from 11/1/03 to present.
jakarta-commons-sandbox-math-new.tar
Original sandbox math tree + recovered additions.
The current CVS structure looks like:
/jakarta-commons-sandbox/math --> changes made up to 11/1/03 + recovered
additions.
/jakarta-commons/math --> changes made from 11/1/03 to 11/13/03.
My major problem now seems to be that the commit emails all have padding
embedded in them that the mailer/log seems to insert, So I'm having a
real difficulty processing them and re-applying them.
I'm wondering if its just easier to merge the two cvs trees, but this is
something I've never attempted before, I could really use any
information on how to best attempt this.
thanks,
-Mark
Dirk Verbeeck wrote:
> First we should inform all math committers of course.
>
> I will take a closer look tomorrow evening but we should undelete the
> files in the sandbox, backup the proper version, do the move like you
> described and then either redo all changes (including commit log) or do
> a simple merge.
> If there are only a few of them then we can use the commit mails.
> The bulk changes, renaming and stuff can be done by merging the backuped
> fileset into the new fileset.
>
> -- Dirk
>
> Mark R. Diggory wrote:
>
>> this would be wise, before things get too different. What would be the
>> best approach to tackle this?
>>
>> -Mark
>>
>> Dirk Verbeeck wrote:
>>
>>> It's only 12 days ago that the move was done.
>>> We could redo the move and then reapply all changes since the move.
>>>
>>> It is a little extra work but if the historical information is
>>> important it is probably worth the effort.
>>>
>>> -- Dirk
>>>
>>>
>>> Mark R. Diggory wrote:
>>>
>>>> The only difficulty I have is that theres a great deal of historical
>>>> information still in the sandbox cvs tree for math, even though the
>>>> latest version has been deleted, you should review how many of these
>>>> trees are historical and are actually now empty directory structures
>>>> (all files deleted). These are easily removed from any cvs checkout
>>>> using -Pd.
>>>>
>>>> I'm not impressed with the way I moved the math project out of the
>>>> sandbox, its version tree sould have been moved physically up to
>>>> commons. This is a little late now, but we should consider moving
>>>> other sandbox projects from now on in a way that maintains the
>>>> historical information.
>>>>
>>>> -Mark
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>
--
Mark Diggory
Software Developer
Harvard MIT Data Center
http://osprey.hmdc.harvard.edu
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
RE: [math] Current CVS status
Posted by "Noel J. Bergman" <no...@devtech.com>.
> Please test and verify that you can checkout and build the new cvs tree
I can now. I could not last night, so something is definitely fixed. Good
work. :-)
--- Noel
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [math] Current CVS status
Posted by "Mark R. Diggory" <md...@latte.harvard.edu>.
Dirk has completed the commit process to bring the cvs uptodate with
where the original /home/cvs/jakarta-commons/math cvs tree was at. He
should be applauded for this great effort on his part to assist us in
maintaining all the historical information in the tree. :-)
Please test and verify that you can checkout and build the new cvs tree
properly and contact the list if you have any issues, please also verify
that any patches you provided are still accurately reflected in the
current head of the tree.
Thanks Dirk! :-)
-Mark
Mark R. Diggory wrote:
> Dirk Verbeck has reworked /home/cvs/jakarta-commons/math tree, which now
> contains the full history from the sandbox plus two refactorings I
> preformed after the move. He will be applying the rest of the changes
> made from 11/1/03 to present today.
>
> The current /home/cvs/jakarta-commons-sandbox/math cvs tree is recovered
> to just prior to the deletion. We will expect to remove this sandbox
> tree once the updating is complete.
>
> We should have things stablized by later today. Sorry for any
> incovenience during this process.
>
> -Mark
>
--
Mark Diggory
Software Developer
Harvard MIT Data Center
http://www.hmdc.harvard.edu
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
[math] Current CVS status
Posted by "Mark R. Diggory" <md...@latte.harvard.edu>.
Dirk Verbeck has reworked /home/cvs/jakarta-commons/math tree, which now
contains the full history from the sandbox plus two refactorings I
preformed after the move. He will be applying the rest of the changes
made from 11/1/03 to present today.
The current /home/cvs/jakarta-commons-sandbox/math cvs tree is recovered
to just prior to the deletion. We will expect to remove this sandbox
tree once the updating is complete.
We should have things stablized by later today. Sorry for any
incovenience during this process.
-Mark
--
Mark Diggory
Software Developer
Harvard MIT Data Center
http://www.hmdc.harvard.edu
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
[math] Merging two cvs trees
Posted by "Mark R. Diggory" <md...@latte.harvard.edu>.
Sorry I meant this to go to the math group
-Mark
Mark R. Diggory wrote:
> Dirk,
>
> Well, I've recovered the sandbox cvs tree up to where I deleted
> everything in the sandbox, this is now under jakarta-commons/math and
> looks ok to me. I have the following backups:
>
> jakarta-commons-sandbox-math-original.tar
> Original sandbox math tree with deletions prior to 11/1/03
>
> jakarta-commons-math-original.tar
> Original commons math tree with changes made from 11/1/03 to present.
>
> jakarta-commons-sandbox-math-new.tar
> Original sandbox math tree + recovered additions.
>
>
> The current CVS structure looks like:
> /jakarta-commons-sandbox/math --> changes made up to 11/1/03 + recovered
> additions.
>
> /jakarta-commons/math --> changes made from 11/1/03 to 11/13/03.
>
>
> My major problem now seems to be that the commit emails all have padding
> embedded in them that the mailer/log seems to insert, So I'm having a
> real difficulty processing them and re-applying them.
>
> I'm wondering if its just easier to merge the two cvs trees, but this is
> something I've never attempted before, I could really use any
> information on how to best attempt this.
>
> thanks,
> -Mark
>
> Dirk Verbeeck wrote:
>
>> First we should inform all math committers of course.
>>
>> I will take a closer look tomorrow evening but we should undelete the
>> files in the sandbox, backup the proper version, do the move like you
>> described and then either redo all changes (including commit log) or
>> do a simple merge.
>> If there are only a few of them then we can use the commit mails.
>> The bulk changes, renaming and stuff can be done by merging the
>> backuped fileset into the new fileset.
>>
>> -- Dirk
>>
>> Mark R. Diggory wrote:
>>
>>> this would be wise, before things get too different. What would be
>>> the best approach to tackle this?
>>>
>>> -Mark
>>>
>>> Dirk Verbeeck wrote:
>>>
>>>> It's only 12 days ago that the move was done.
>>>> We could redo the move and then reapply all changes since the move.
>>>>
>>>> It is a little extra work but if the historical information is
>>>> important it is probably worth the effort.
>>>>
>>>> -- Dirk
>>>>
>>>>
>>>> Mark R. Diggory wrote:
>>>>
>>>>> The only difficulty I have is that theres a great deal of
>>>>> historical information still in the sandbox cvs tree for math, even
>>>>> though the latest version has been deleted, you should review how
>>>>> many of these trees are historical and are actually now empty
>>>>> directory structures (all files deleted). These are easily removed
>>>>> from any cvs checkout using -Pd.
>>>>>
>>>>> I'm not impressed with the way I moved the math project out of the
>>>>> sandbox, its version tree sould have been moved physically up to
>>>>> commons. This is a little late now, but we should consider moving
>>>>> other sandbox projects from now on in a way that maintains the
>>>>> historical information.
>>>>>
>>>>> -Mark
>>
>>
>>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
>> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>>
>
--
Mark Diggory
Software Developer
Harvard MIT Data Center
http://osprey.hmdc.harvard.edu
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org