cvs -z9 diff (in directory C:\pgadmin2\pgadmin2\)
cvs diff: Empty password used - try 'cvs login' with a real password

? MSSCCPRJ.SCC
? pgAdmin2.vbw
? plugins/template/MSSCCPRJ.SCC
? plugins/template/pgTemplate.vbw
cvs server: Diffing .
Index: basClone.bas
===================================================================
RCS file: /disk1/cvsroot/pgadmin2/basClone.bas,v
retrieving revision 1.1
diff -r1.1 basClone.bas
29c29
<     Case "Domain", "Table", "View", "Group", "User", "Function", "Aggregate", "Operator", "Cast", "Type"
---
>     Case "Domain", "Table", "View", "Group", "User", "Function", "Aggregate", "Operator", "Cast", "Type", "Conversion"
238a239,253
> End Function
> 
> 'clone conversion
> Public Function CloneConversion(szNewName As String, szDatabase As String, szNamespace As String) As pgConversion
> If inIDE Then: On Error GoTo 0: Else: On Error GoTo Err_Handler
> frmMain.svr.LogEvent "Entering " & App.Title & ":basClone.CloneConversion(" & QUOTE & szNewName & QUOTE & "," & QUOTE & szDatabase & QUOTE & "," & QUOTE & szNamespace & QUOTE & ")", etFullDebug
> 
> Dim objNewConversion As pgConversion
> 
>   Set objNewConversion = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Conversions.Add(szNewName, False, ObjDbClone.ForEncoding, ObjDbClone.ToEncoding, ObjDbClone.Proc)
>   
>   Set CloneConversion = objNewConversion
>   Exit Function
>   
> Err_Handler: If Err.Number <> 0 Then LogError Err.Number, Err.Description, App.Title & ":basClone.CloneConversion"
Index: clsContext.cls
===================================================================
RCS file: /disk1/cvsroot/pgadmin2/clsContext.cls,v
retrieving revision 1.23
diff -r1.23 clsContext.cls
131c131
<     Case "Domain", "Table", "View", "Group", "User", "Function", "Aggregate", "Operator", "Cast", "Type"
---
>     Case "Domain", "Table", "View", "Group", "User", "Function", "Aggregate", "Operator", "Cast", "Type", "Conversion"
Index: frmClone.frm
===================================================================
RCS file: /disk1/cvsroot/pgadmin2/frmClone.frm,v
retrieving revision 1.1
diff -r1.1 frmClone.frm
2c2
< Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "mscomctl.ocx"
---
> Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "MSCOMCTL.OCX"
26c26
<          NumListImages   =   23
---
>          NumListImages   =   24
118a119,122
>          BeginProperty ListImage24 {2C247F27-8591-11D1-B16A-00C0F0283628} 
>             Picture         =   "frmClone.frx":9406
>             Key             =   "conversion"
>          EndProperty
242c246
<     Case "Domain", "Table", "View", "Function", "Aggregate", "Operator", "Type"
---
>     Case "Domain", "Table", "View", "Function", "Aggregate", "Operator", "Type", "Conversion"
268a273,280
>     Case "Conversion"
>       Set objTmp = CloneConversion(txtNewName.Text, ctx.CurrentDB, ctx.CurrentNS)
>     
>       'Add a new node and update the text on the parent
>       Set objNode = frmMain.svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Conversions.Tag
>       Set objTmp.Tag = frmMain.tv.Nodes.Add(objNode.Key, tvwChild, "CNV-" & GetID, txtNewName.Text, "conversion")
>       objNode.Text = "Conversions (" & objNode.Children & ")"
> 
Index: frmClone.frx
===================================================================
RCS file: /disk1/cvsroot/pgadmin2/frmClone.frx,v
retrieving revision 1.1
diff -r1.1 frmClone.frx
Binary files /tmp/cvseogPHF and frmClone.frx differ
Index: frmFind.frm
===================================================================
RCS file: /disk1/cvsroot/pgadmin2/frmFind.frm,v
retrieving revision 1.8
diff -r1.8 frmFind.frm
2c2
< Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "mscomctl.ocx"
---
> Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "MSCOMCTL.OCX"
323c323
<          NumListImages   =   29
---
>          NumListImages   =   30
439a440,443
>          BeginProperty ListImage30 {2C247F27-8591-11D1-B16A-00C0F0283628} 
>             Picture         =   "frmFind.frx":C7D4
>             Key             =   "conversion"
>          EndProperty
586c590
< Dim szSql As String
---
> Dim szSQL As String
612c616
<   szSql = txtSql.Text:  iLenSql = Len(szSql)
---
>   szSQL = txtSql.Text:  iLenSql = Len(szSQL)
718c722
<                 bFoundSql = objTmp.SQL = szSql
---
>                 bFoundSql = objTmp.SQL = szSQL
720c724
<                 bFoundSql = Left(objTmp.SQL, iLenSql) = szSql
---
>                 bFoundSql = Left(objTmp.SQL, iLenSql) = szSQL
722c726
<                 bFoundSql = Right(objTmp.SQL, iLenSql) = szSql
---
>                 bFoundSql = Right(objTmp.SQL, iLenSql) = szSQL
724c728
<                 bFoundSql = InStr(objTmp.SQL, szSql) > 0
---
>                 bFoundSql = InStr(objTmp.SQL, szSQL) > 0
Index: frmFind.frx
===================================================================
RCS file: /disk1/cvsroot/pgadmin2/frmFind.frx,v
retrieving revision 1.3
diff -r1.3 frmFind.frx
Binary files /tmp/cvsc95MmX and frmFind.frx differ
Index: pgAdmin2.vbp
===================================================================
RCS file: /disk1/cvsroot/pgadmin2/pgAdmin2.vbp,v
retrieving revision 1.148
diff -r1.148 pgAdmin2.vbp
2,4c2,4
< Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation
< Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\Program Files\Common Files\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library
< Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\..\..\..\WINDOWS\System32\msstdfmt.dll#Microsoft Data Formatting Object Library 6.0 (SP4)
---
> Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\WINNT\System32\Stdole2.tlb#OLE Automation
> Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library
> Reference=*\G{6B263850-900B-11D0-9484-00A0C91110ED}#1.0#0#..\..\WINNT\System32\MSSTDFMT.DLL#Microsoft Data Formatting Object Library 6.0 (SP4)
8,10c8,10
< Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx
< Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx
< Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx
---
> Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX
> Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX
> Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
12c12
< Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx
---
> Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX
cvs server: Diffing exporters
cvs server: Diffing exporters/abstract
cvs server: Diffing exporters/access
cvs server: Diffing exporters/access/images
cvs server: Diffing exporters/ascii
cvs server: Diffing exporters/excel
cvs server: Diffing exporters/html
cvs server: Diffing help
cvs server: Diffing help/html
cvs server: Diffing help/html/developerinfo
cvs server: Diffing help/html/howtos
cvs server: Diffing help/html/images
cvs server: Diffing help/html/licenceinfo
cvs server: Diffing images
cvs server: Diffing installer
cvs server: Diffing plugins
cvs server: Diffing plugins/abstract
cvs server: Diffing plugins/conndebug
cvs server: Diffing plugins/hba
cvs server: Diffing plugins/hba/images
cvs server: Diffing plugins/import
cvs server: Diffing plugins/import/images
cvs server: Diffing plugins/migration
cvs server: Diffing plugins/migration/images
cvs server: Diffing plugins/msysconf
cvs server: Diffing plugins/msysconf/images
cvs server: Diffing plugins/publishing
cvs server: Diffing plugins/publishing/images
cvs server: Diffing plugins/security
cvs server: Diffing plugins/security/images
cvs server: Diffing plugins/template


***** CVS exited normally with code 1 *****