poi-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Glen Stampoultzis <gst...@iinet.net.au>
Subject Re: Ouch! Clobbered files after Merge
Date Mon, 27 Sep 2004 11:40:51 GMT

Very sorry about that.  I couldn't do a proper merge because the branch had 
grown too different from the head.  I posted a plan of what I was going to 
do (which I pretty much followed) so you can have a look at that to see 
which bits were clobbered.

-- Glen

At 01:52 PM 27/09/2004, you wrote:
>Hi Glen,
>
>
>
>Seems like there were some things that were not added to REL_2_BRANCH
>that were added to HEAD. Now they have been clobbered!
>
>
>
>Mainly my patches to correctly support DBCell and Index Records to Sheet
>and other files. I will attempt to reconstruct the patches and reapply.
>
>
>
>At the moment CVS will generate corrupt files in a number of situations.
>
>
>
>Thanks
>
>
>
>Jason Height
>
>--------------------------------------------------------------------------------------------------------------------
>This e-mail (including attachments) is confidential information of 
>Australian Submarine Corporation Pty Limited (ASC).  It may also be 
>legally privileged.  Unauthorised use and disclosure is prohibited.  ASC 
>is not taken to have waived confidentiality or privilege if this e-mail 
>was sent to you in error. If you have received it in error, please notify 
>the sender promptly.  While ASC takes steps to identify and eliminate 
>viruses, it cannot confirm that this e-mail is free from them.  You should 
>scan this e-mail for viruses before it is used.  The statements in this 
>e-mail are those of the sender only, unless specifically stated to be 
>those of ASC by someone with authority to do so.


Glen Stampoultzis
gstamp@iinet.net.au
http://members.iinet.net.au/~gstamp/glen/

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message