cvs -z9 diff (in directory C:\frank\progetti\opensource\pgadmin2\pgadmin2\) cvs diff: Empty password used - try 'cvs login' with a real password ? pgAdmin2.vbw cvs server: Diffing . Index: basGlobal.bas =================================================================== RCS file: /disk1/cvsroot/pgadmin2/basGlobal.bas,v retrieving revision 1.8 diff -r1.8 basGlobal.bas 40a41,42 > 'error to ignore > Global ColIgnoreError As New Collection Index: basMisc.bas =================================================================== RCS file: /disk1/cvsroot/pgadmin2/basMisc.bas,v retrieving revision 1.43 diff -r1.43 basMisc.bas 288a289,290 > Dim bShowFormErr As Boolean > Dim vData 292,294c294,307 < Load objErrorForm < objErrorForm.Initialise lError, szError, szRoutine < objErrorForm.Show vbModal --- > 'find error in ignore error > bShowFormErr = True > For Each vData In ColIgnoreError > If vData = szRoutine & "_" & lError & "_" & szError Then > bShowFormErr = False > Exit For > End If > Next > > If bShowFormErr Then > Load objErrorForm > objErrorForm.Initialise lError, szError, szRoutine > objErrorForm.Show vbModal > End If 302d314 < Index: frmError.frm =================================================================== RCS file: /disk1/cvsroot/pgadmin2/frmError.frm,v retrieving revision 1.5 diff -r1.5 frmError.frm 7,8c7,8 < ClientLeft = 4440 < ClientTop = 4212 --- > ClientLeft = 2880 > ClientTop = 3156 15a16,32 > Begin VB.CheckBox chkAutoStart > Caption = "&Auto Start Application on exit" > Height = 195 > Left = 120 > TabIndex = 15 > Top = 2280 > Value = 1 'Checked > Width = 2415 > End > Begin VB.CheckBox chkIgnoreError > Caption = "&Ignore this error (in this routine) until application is restarted" > Height = 255 > Left = 120 > TabIndex = 14 > Top = 2520 > Width = 4455 > End 36,37c53,54 < Height = 1770 < Left = 45 --- > Height = 1296 > Left = 48 39,40c56,57 < Top = 945 < Width = 7305 --- > Top = 948 > Width = 7308 42c59 < _ExtentY = 3112 --- > _ExtentY = 2286 261a279,282 > 'verify is execute a auto start application > If chkAutoStart.Value = 1 Then > Shell App.Path & "\" & App.EXEName & " " & Command, vbNormalFocus > End If 292a314,320 > 'store error in ingore error > If chkIgnoreError.Value = vbChecked Then > With objError > ColIgnoreError.Add .Routine & "_" & .Number & "_" & .Description > End With > End If > Index: frmForeignKey.frm =================================================================== RCS file: /disk1/cvsroot/pgadmin2/frmForeignKey.frm,v retrieving revision 1.17 diff -r1.17 frmForeignKey.frm 2,3c2,3 < Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "mscomctl.ocx" < Object = "{BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0"; "tabctl32.ocx" --- > Object = "{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0"; "MSCOMCTL.OCX" > Object = "{BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0"; "TABCTL32.OCX" 7,9c7,9 < ClientHeight = 6885 < ClientLeft = 45 < ClientTop = 330 --- > ClientHeight = 6876 > ClientLeft = 2940 > ClientTop = 1884 14c14 < ScaleHeight = 6885 --- > ScaleHeight = 6876 16d15 < StartUpPosition = 3 'Windows Default 146c145 < Height = 330 --- > Height = 300 148c147 < Left = 1935 --- > Left = 1932 152,154c151,153 < Width = 3390 < _ExtentX = 5980 < _ExtentY = 582 --- > Width = 3396 > _ExtentX = 5990 > _ExtentY = 529 162c161 < Height = 330 --- > Height = 300 164c163 < Left = 1935 --- > Left = 1932 167,170c166,169 < Top = 1845 < Width = 3390 < _ExtentX = 5980 < _ExtentY = 582 --- > Top = 1848 > Width = 3396 > _ExtentX = 5990 > _ExtentY = 529 178c177 < Height = 330 --- > Height = 300 180c179 < Left = 1935 --- > Left = 1932 183,186c182,185 < Top = 2250 < Width = 3390 < _ExtentX = 5980 < _ExtentY = 582 --- > Top = 2256 > Width = 3396 > _ExtentX = 5990 > _ExtentY = 529 194c193 < Height = 330 --- > Height = 300 196c195 < Left = 1935 --- > Left = 1932 199,202c198,201 < Top = 2655 < Width = 3390 < _ExtentX = 5980 < _ExtentY = 582 --- > Top = 2652 > Width = 3396 > _ExtentX = 5990 > _ExtentY = 529 210c209 < Height = 330 --- > Height = 300 212c211 < Left = 1935 --- > Left = 1932 215,218c214,217 < Top = 3465 < Width = 3390 < _ExtentX = 5980 < _ExtentY = 582 --- > Top = 3468 > Width = 3396 > _ExtentX = 5990 > _ExtentY = 529 233,234c232,233 < _ExtentX = 5980 < _ExtentY = 7964 --- > _ExtentX = 5990 > _ExtentY = 7959 259c258 < Height = 330 --- > Height = 300 261c260 < Left = -73065 --- > Left = -73068 264,267c263,266 < Top = 630 < Width = 3390 < _ExtentX = 5980 < _ExtentY = 582 --- > Top = 636 > Width = 3396 > _ExtentX = 5990 > _ExtentY = 529 275c274 < Height = 330 --- > Height = 300 277c276 < Left = -73065 --- > Left = -73068 281,283c280,282 < Width = 3390 < _ExtentX = 5980 < _ExtentY = 582 --- > Width = 3396 > _ExtentX = 5990 > _ExtentY = 529 384,385c383,384 < _ExtentX = 1005 < _ExtentY = 1005 --- > _ExtentX = 995 > _ExtentY = 995 649c648 < txtProperties(1).Text = objForeignKey.OID --- > txtProperties(1).Text = objForeignKey.Oid Index: frmMain.frm =================================================================== RCS file: /disk1/cvsroot/pgadmin2/frmMain.frm,v retrieving revision 1.104 diff -r1.104 frmMain.frm 9,10c9,10 < ClientLeft = 3720 < ClientTop = 2076 --- > ClientLeft = 2052 > ClientTop = 1944 3463,3466c3463,3468 < If Not (svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Sequences(rsStat!relname).SystemObject And Not ctx.IncludeSys) Then < Set lvItem = sv.ListItems.Add(, "STA+" & GetID, rsStat!relname & "", "statistics", "statistics") < lvItem.SubItems(1) = rsStat!blks_read & "" < lvItem.SubItems(2) = rsStat!blks_hit & "" --- > If svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Sequences.Exists(rsStat!relname) Then > If Not (svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Sequences(rsStat!relname).SystemObject And Not ctx.IncludeSys) Then > Set lvItem = sv.ListItems.Add(, "STA+" & GetID, rsStat!relname & "", "statistics", "statistics") > lvItem.SubItems(1) = rsStat!blks_read & "" > lvItem.SubItems(2) = rsStat!blks_hit & "" > End If 3620,3624c3622,3628 < If Not (svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Tables(rsStat!relname).SystemObject And Not ctx.IncludeSys) Then < Set lvItem = sv.ListItems.Add(, "STA+" & GetID, rsStat!relname & "", "statistics", "statistics") < lvItem.SubItems(1) = rsStat!n_tup_ins & "" < lvItem.SubItems(2) = rsStat!n_tup_upd & "" < lvItem.SubItems(3) = rsStat!n_tup_del & "" --- > If svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Tables.Exists(rsStat!relname) Then > If Not (svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Tables(rsStat!relname).SystemObject And Not ctx.IncludeSys) Then > Set lvItem = sv.ListItems.Add(, "STA+" & GetID, rsStat!relname & "", "statistics", "statistics") > lvItem.SubItems(1) = rsStat!n_tup_ins & "" > lvItem.SubItems(2) = rsStat!n_tup_upd & "" > lvItem.SubItems(3) = rsStat!n_tup_del & "" > End If 4146,4149c4150,4155 < If Not (svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Tables(rsStat!relname).Indexes(rsStat!indexrelname).SystemObject And Not ctx.IncludeSys) Then < Set lvItem = sv.ListItems.Add(, "STA+" & GetID, rsStat!indexrelname & "", "statistics", "statistics") < lvItem.SubItems(1) = rsStat!idx_blks_read & "" < lvItem.SubItems(2) = rsStat!idx_blks_hit & "" --- > If svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Tables(rsStat!relname).Indexes.Exists(rsStat!indexrelname) Then > If Not (svr.Databases(ctx.CurrentDB).Namespaces(ctx.CurrentNS).Tables(rsStat!relname).Indexes(rsStat!indexrelname).SystemObject And Not ctx.IncludeSys) Then > Set lvItem = sv.ListItems.Add(, "STA+" & GetID, rsStat!indexrelname & "", "statistics", "statistics") > lvItem.SubItems(1) = rsStat!idx_blks_read & "" > lvItem.SubItems(2) = rsStat!idx_blks_hit & "" > End If Index: frmTable.frm =================================================================== RCS file: /disk1/cvsroot/pgadmin2/frmTable.frm,v retrieving revision 1.38 diff -r1.38 frmTable.frm 8,10c8,10 < ClientHeight = 6885 < ClientLeft = 4995 < ClientTop = 2490 --- > ClientHeight = 6876 > ClientLeft = 4992 > ClientTop = 2496 15c15 < ScaleHeight = 6885 --- > ScaleHeight = 6876 76d75 < Tab(1).Control(0).Enabled= 0 'False 78d76 < Tab(1).Control(1).Enabled= 0 'False 80d77 < Tab(1).Control(2).Enabled= 0 'False 82d78 < Tab(1).Control(3).Enabled= 0 'False 140c136 < Height = 330 --- > Height = 300 142c138 < Left = 1935 --- > Left = 1932 146,148c142,144 < Width = 3390 < _ExtentX = 5980 < _ExtentY = 582 --- > Width = 3396 > _ExtentX = 5990 > _ExtentY = 529 156c152 < Height = 330 --- > Height = 300 158c154 < Left = -73065 --- > Left = -73068 160,163c156,159 < Top = 5850 < Width = 3390 < _ExtentX = 5980 < _ExtentY = 582 --- > Top = 5856 > Width = 3396 > _ExtentX = 5990 > _ExtentY = 529 249c245 < Left = -74865 --- > Left = -74880 262c258 < _ExtentX = 9155 --- > _ExtentX = 9165 445c441 < Height = 330 --- > Height = 300 449,452c445,448 < Top = 315 < Width = 3705 < _ExtentX = 6535 < _ExtentY = 582 --- > Top = 312 > Width = 3708 > _ExtentX = 6541 > _ExtentY = 529 487,488c483,484 < _ExtentX = 9155 < _ExtentY = 5980 --- > _ExtentX = 9165 > _ExtentY = 5990 520c516 < _ExtentX = 9155 --- > _ExtentX = 9165 524c520 < Size = 8.25 --- > Size = 7.8 540,541c536,537 < _ExtentX = 9155 < _ExtentY = 9234 --- > _ExtentX = 9165 > _ExtentY = 9229 603,604c599,600 < _ExtentX = 9155 < _ExtentY = 8440 --- > _ExtentX = 9165 > _ExtentY = 8446 631,632c627,628 < _ExtentX = 9155 < _ExtentY = 1535 --- > _ExtentX = 9165 > _ExtentY = 1545 635c631 < Size = 8.25 --- > Size = 7.8 651,652c647,648 < _ExtentX = 9155 < _ExtentY = 6853 --- > _ExtentX = 9165 > _ExtentY = 6858 739,740c735,736 < _ExtentX = 1005 < _ExtentY = 1005 --- > _ExtentX = 995 > _ExtentY = 995 800a797 > Dim szDropForeignKeyList As String 967a965,967 > If Not objTable Is Nothing Then > szDropForeignKeyList = szDropForeignKeyList & lvProperties(2).SelectedItem.Text & "!|!" > End If 1045a1046 > Dim objNewForeignKey As pgForeignKey 1055a1057 > Dim szDropForeignKeys() As String 1153,1155c1155,1159 < Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns.Tag < Set objNewColumn.Tag = frmMain.tv.Nodes.Add(objNode.Key, tvwChild, "COL-" & GetID, objItem.Text, "column") < objNode.Text = "Columns (" & objNode.Children & ")" --- > If Len(frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns.Tag) > 0 Then > Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns.Tag > Set objNewColumn.Tag = frmMain.tv.Nodes.Add(objNode.Key, tvwChild, "COL-" & GetID, objItem.Text, "column") > objNode.Text = "Columns (" & objNode.Children & ")" > End If 1165,1174c1169,1180 < If IsObject(frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns(szDropColumns(X)).Tag) Then < Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns(szDropColumns(X)).Tag < bFlag = True < Else < bFlag = False < End If < frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns.Remove szDropColumns(X) < If bFlag Then < objNode.Parent.Text = "Columns (" & objNode.Children - 1 & ")" < frmMain.tv.Nodes.Remove objNode.Index --- > If frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns.Exists(szDropColumns(X)) Then > If IsObject(frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns(szDropColumns(X)).Tag) Then > Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns(szDropColumns(X)).Tag > bFlag = True > Else > bFlag = False > End If > frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Columns.Remove szDropColumns(X) > If bFlag Then > objNode.Parent.Text = "Columns (" & objNode.Children - 1 & ")" > frmMain.tv.Nodes.Remove objNode.Index > End If 1185,1187c1191,1195 < Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks.Tag < Set objNewCheck.Tag = frmMain.tv.Nodes.Add(objNode.Key, tvwChild, "CHK-" & GetID, objItem.Text, "check") < objNode.Text = "Checks (" & objNode.Children & ")" --- > If Len(frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks.Tag) > 0 Then > Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks.Tag > Set objNewCheck.Tag = frmMain.tv.Nodes.Add(objNode.Key, tvwChild, "CHK-" & GetID, objItem.Text, "check") > objNode.Text = "Checks (" & objNode.Children & ")" > End If 1197,1201c1205,1216 < If IsObject(frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks(szDropColumns(X)).Tag) Then < Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks(szDropColumns(X)).Tag < bFlag = True < Else < bFlag = False --- > If frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks.Exists(szDropChecks(X)) Then > If IsObject(frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks(szDropChecks(X)).Tag) Then > Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks(szDropChecks(X)).Tag > bFlag = True > Else > bFlag = False > End If > frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks.Remove szDropChecks(X) > If bFlag Then > objNode.Parent.Text = "Checks (" & objNode.Children - 1 & ")" > frmMain.tv.Nodes.Remove objNode.Index > End If 1203,1206c1218,1259 < frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).Checks.Remove szDropColumns(X) < If bFlag Then < objNode.Parent.Text = "Checks (" & objNode.Children - 1 & ")" < frmMain.tv.Nodes.Remove objNode.Index --- > End If > Next X > End If > > 'Add new Foreign Keys > If lvProperties(2).Tag = "Y" Then > For Each objItem In lvProperties(2).ListItems > If objItem.Tag <> "ORIG" Then > szForeignKeys = " FOREIGN KEY (" & objItem.SubItems(2) & ") " > szForeignKeys = szForeignKeys & "REFERENCES " & objItem.SubItems(1) & " (" & objItem.SubItems(3) & ")" > szForeignKeys = szForeignKeys & " ON DELETE " & UCase(objItem.SubItems(4)) > szForeignKeys = szForeignKeys & " ON UPDATE " & UCase(objItem.SubItems(5)) > If objItem.SubItems(6) = "Yes" Then szForeignKeys = szForeignKeys & " DEFERRABLE" > szForeignKeys = szForeignKeys & " INITIALLY " & UCase(objItem.SubItems(7)) > > Set objNewForeignKey = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).ForeignKeys.Add(objItem.Text, szForeignKeys) > If Len(frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).ForeignKeys.Tag) > 0 Then > Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).ForeignKeys.Tag > Set objNewForeignKey.Tag = frmMain.tv.Nodes.Add(objNode.Key, tvwChild, "FKY-" & GetID, objItem.Text, "foreignkey") > objNode.Text = "Foreign Keys (" & objNode.Children & ")" > End If > End If > Next objItem > End If > > 'Drop any old ForeignKey > If Len(szDropForeignKeyList) > 3 Then > szDropForeignKeys = Split(szDropForeignKeyList, "!|!") > For X = 0 To UBound(szDropForeignKeys) > If szDropForeignKeys(X) <> "" Then > If frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).ForeignKeys.Exists(szDropForeignKeys(X)) Then > If IsObject(frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).ForeignKeys(szDropForeignKeys(X)).Tag) Then > Set objNode = frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).ForeignKeys(szDropForeignKeys(X)).Tag > bFlag = True > Else > bFlag = False > End If > frmMain.svr.Databases(szDatabase).Namespaces(szNamespace).Tables(txtProperties(0).Text).ForeignKeys.Remove szDropForeignKeys(X) > If bFlag Then > objNode.Parent.Text = "Foreign Keys (" & objNode.Children - 1 & ")" > frmMain.tv.Nodes.Remove objNode.Index > End If 1362a1416,1421 > If ctx.dbVer >= 7.3 Then > cmdFkyAdd.Enabled = True > cmdFkyRemove.Enabled = True > lvProperties(2).BackColor = &H80000005 > End If > 1365c1424 < txtProperties(1).Text = objTable.OID --- > txtProperties(1).Text = objTable.Oid 1408c1467,1468 < Set objItem = lvProperties(2).ListItems.Add(, , objForeignKey.Name, "foreignkey", "foreignkey") --- > ' Set objItem = lvProperties(2).ListItems.Add(, , objForeignKey.Name, "foreignkey", "foreignkey") > Set objItem = lvProperties(2).ListItems.Add(, , objForeignKey.Identifier, "foreignkey", "foreignkey") 1423a1484 > objItem.Tag = "ORIG" Index: pgAdmin2.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/pgAdmin2.vbp,v retrieving revision 1.157 diff -r1.157 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#..\..\..\..\..\WINDOWS\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#..\..\..\..\..\WINDOWS\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 81c81 < RevisionVer=45 --- > RevisionVer=49 cvs server: Diffing exporters cvs server: Diffing exporters/abstract Index: exporters/abstract/pgAbsExp.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/abstract/pgAbsExp.vbp,v retrieving revision 1.103 diff -r1.103 pgAbsExp.vbp 2,3c2,3 < 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{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\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 19c19 < RevisionVer=32 --- > RevisionVer=35 cvs server: Diffing exporters/access Index: exporters/access/pgAccess.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/access/pgAccess.vbp,v retrieving revision 1.21 diff -r1.21 pgAccess.vbp 2c2 < 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{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 4c4 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX 8c8 < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx --- > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX 23c23 < RevisionVer=32 --- > RevisionVer=35 cvs server: Diffing exporters/access/images cvs server: Diffing exporters/ascii Index: exporters/ascii/pgASCII.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/ascii/pgASCII.vbp,v retrieving revision 1.106 diff -r1.106 pgASCII.vbp 2,3c2,3 < 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{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\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 5,7c5,7 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX 26c26 < RevisionVer=32 --- > RevisionVer=35 cvs server: Diffing exporters/excel Index: exporters/excel/pgExcel.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/excel/pgExcel.vbp,v retrieving revision 1.105 diff -r1.105 pgExcel.vbp 2c2 < 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{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library 19c19 < RevisionVer=32 --- > RevisionVer=35 cvs server: Diffing exporters/html Index: exporters/html/pgHTML.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/exporters/html/pgHTML.vbp,v retrieving revision 1.104 diff -r1.104 pgHTML.vbp 2c2 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation 4,5c4,5 < 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 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx --- > Reference=*\G{00000200-0000-0010-8000-00AA006D2EA4}#2.0#0#..\..\..\..\..\..\..\Programmi\File comuni\system\ado\msado20.tlb#Microsoft ActiveX Data Objects 2.0 Library > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX 22c22 < RevisionVer=31 --- > RevisionVer=34 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 Index: plugins/abstract/pgAbsPlg.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/abstract/pgAbsPlg.vbp,v retrieving revision 1.104 diff -r1.104 pgAbsPlg.vbp 2,3c2,3 < 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{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\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 20c20 < RevisionVer=32 --- > RevisionVer=35 cvs server: Diffing plugins/conndebug Index: plugins/conndebug/pgConnDebug.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/conndebug/pgConnDebug.vbp,v retrieving revision 1.92 diff -r1.92 pgConnDebug.vbp 2c2 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation 5,6c5,6 < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx --- > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX 27c27 < RevisionVer=32 --- > RevisionVer=34 cvs server: Diffing plugins/hba Index: plugins/hba/pgHba.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/hba/pgHba.vbp,v retrieving revision 1.20 diff -r1.20 pgHba.vbp 2c2 < Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\stdole2.tlb#OLE Automation --- > Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\System32\Stdole2.tlb#OLE Automation 5,6c5,6 < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx --- > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX 12c12 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX 28c28 < RevisionVer=33 --- > RevisionVer=36 cvs server: Diffing plugins/hba/images cvs server: Diffing plugins/import Index: plugins/import/pgImport.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/import/pgImport.vbp,v retrieving revision 1.105 diff -r1.105 pgImport.vbp 2,3c2,3 < 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{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\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 6,9c6,9 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 30c30 < RevisionVer=32 --- > RevisionVer=34 cvs server: Diffing plugins/import/images cvs server: Diffing plugins/migration Index: plugins/migration/pgMigration.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/migration/pgMigration.vbp,v retrieving revision 1.104 diff -r1.104 pgMigration.vbp 2,3c2,3 < 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{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\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 6,10c6,10 < Reference=*\G{00000600-0000-0010-8000-00AA006D2EA4}#2.7#0#..\..\..\..\..\..\..\Program Files\Common Files\System\ado\msadox.dll#Microsoft ADO Ext. 2.7 for DDL and Security < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Reference=*\G{00000600-0000-0010-8000-00AA006D2EA4}#2.7#0#..\..\..\..\..\..\..\Programmi\File comuni\System\ado\msadox.dll#Microsoft ADO Ext. 2.7 for DDL and Security > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 32c32 < RevisionVer=30 --- > RevisionVer=32 cvs server: Diffing plugins/migration/images cvs server: Diffing plugins/msysconf Index: plugins/msysconf/pgMSysConf.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/msysconf/pgMSysConf.vbp,v retrieving revision 1.110 diff -r1.110 pgMSysConf.vbp 2,3c2,3 < 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{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\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 6,9c6,9 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 28c28 < RevisionVer=32 --- > RevisionVer=34 cvs server: Diffing plugins/msysconf/images cvs server: Diffing plugins/publishing Index: plugins/publishing/pgPublishing.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/publishing/pgPublishing.vbp,v retrieving revision 1.97 diff -r1.97 pgPublishing.vbp 2,3c2,3 < 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{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\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 6,9c6,9 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 29c29 < RevisionVer=32 --- > RevisionVer=34 cvs server: Diffing plugins/publishing/images cvs server: Diffing plugins/security Index: plugins/security/pgSecurity.vbp =================================================================== RCS file: /disk1/cvsroot/pgadmin2/plugins/security/pgSecurity.vbp,v retrieving revision 1.105 diff -r1.105 pgSecurity.vbp 2,3c2,3 < 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{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\..\..\WINDOWS\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 6,9c6,9 < Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; comdlg32.ocx < Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; tabctl32.ocx < Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; mscomctl.ocx < Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; mscomct2.ocx --- > Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX > Object={BDC217C8-ED16-11CD-956C-0000C04E4C0A}#1.1#0; TABCTL32.OCX > Object={831FDD16-0C5C-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCTL.OCX > Object={86CF1D34-0C5F-11D2-A9FC-0000F8754DA1}#2.0#0; MSCOMCT2.OCX 28c28 < RevisionVer=32 --- > RevisionVer=34 cvs server: Diffing plugins/security/images cvs server: Diffing plugins/template ***** CVS exited normally with code 1 *****