[svk-devel] push/pull leads to inconsistent local branch state?
Derek Atkins
warlord at MIT.EDU
Thu Nov 30 00:34:42 EST 2006
Hi,
I've done (effectively) the following:
svk mirror ..
svk cp mirror local
svk co local wc
cd wc
svk pull
...
svk push --verbatim
..
svk pull
...
svk push --verbatim
(sometimes with multiple pulls before a push).
Here's log of the whole session... Notice that a file was removed
during a pull but later a push wanted to re-add it, or something like
that. I dont understand why files that I dont touch in my own checkout
are affecting my push. And no, the problem is NOT the "pre-commit"
hook failure. Maybe one of the devs can answer or help me track this
down?
(I'll note that some of the log is a cut-and-paste, and some of it
is "svk push >> logfile" or "svk pull >> logfile")
This is svk, version 1.99_04 (using Subversion bindings 1.3.2)
Help?
-derek
[warlord at cliodev src]$ svk pull
Enter passphrase for key '/home/warlord/.ssh/id_dsa':
Syncing svn+ssh://mars.pgp.com/svn/pgpsrc
Auto-merging (49541, 49553) /mirrors/pgpsrc/trunk to /local/cmdln-dev (base /local/cmdln-dev:49544).
U clients2/shared/pgpDefaultKeys.c
U clients2/tray/ptwde.cpp
U clients2/engine/osx/src/CPGPMessagingAccountManager.m
U ovid/build/linux/ovidserver.spec
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenJava.java
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenCpp.java
U ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/FilterTest.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/ManagerImpl.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/filter/Filter.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/filter/Ordering.javaD ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/filter/FilterFactory.java
A ovid/server/shared/oviddata/Filter.h
U ovid/server/shared/oviddata/util.cpp
A ovid/server/shared/oviddata/Filter.cpp
A ovid/server/shared/oviddata/test/FilterTest.h
U ovid/server/shared/oviddata/test/ODataTest.h
U ovid/server/shared/oviddata/test/ODataTest.cpp
A ovid/server/shared/oviddata/test/FilterTest.cpp
U ovid/design/arcadia/BRPSO-Arc-Customization.doc
New merge ticket: a79679b3-9302-0410-9f41-d51457bc89fc:/trunk:49474
Committed revision 49554.
Syncing /pgp/local/cmdln-dev(/local/cmdln-dev) in /home/warlord/src/pgpsrc-cmdln-lib/src to 49554.
clients2/shared - skipped
clients2/shared/pgpDefaultKeys.c - skipped
clients2/tray - skipped
clients2/tray/ptwde.cpp - skipped
clients2/engine - skipped
clients2/engine/osx/src/CPGPMessagingAccountManager.m - skipped
ovid - skipped
ovid/build/linux/ovidserver.spec - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenJava.java - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenCpp.java - skipped ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/FilterTest.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/ManagerImpl.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/filter/Filter.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/filter/Ordering.java - skipped
ovid/server/shared/oviddata/util.cpp - skipped
ovid/server/shared/oviddata/test/ODataTest.h - skipped
ovid/server/shared/oviddata/test/ODataTest.cpp - skipped
ovid/design/arcadia/BRPSO-Arc-Customization.doc - skipped
Tue Nov 21 17:59:01 EST 2006
Syncing svn+ssh://mars.pgp.com/svn/pgpsrc
Retrieving log information from 49475 to 49496
Committed revision 49555 from revision 49475.
Committed revision 49556 from revision 49476.
Committed revision 49557 from revision 49477.
Committed revision 49558 from revision 49478.
Committed revision 49559 from revision 49479.
Committed revision 49560 from revision 49480.
Committed revision 49561 from revision 49481.
Committed revision 49562 from revision 49482.
Committed revision 49563 from revision 49483.
Committed revision 49564 from revision 49484.
Committed revision 49565 from revision 49485.
Committed revision 49566 from revision 49486.
Committed revision 49567 from revision 49487.
Committed revision 49568 from revision 49488.
Committed revision 49569 from revision 49489.
Committed revision 49570 from revision 49490.
Committed revision 49571 from revision 49491.
Committed revision 49572 from revision 49492.
Committed revision 49573 from revision 49493.
Committed revision 49574 from revision 49494.
Committed revision 49575 from revision 49495.
Committed revision 49576 from revision 49496.
Auto-merging (49553, 49576) /mirrors/pgpsrc/trunk to /local/cmdln-dev (base /mirrors/pgpsrc/trunk:49553).
U clients2/calliope/fsfd/CFilterFastIo.cpp
U clients2/calliope/fsfd/CFilterCallback.cpp
U clients2/calliope/fsfd/CFilterPath.cpp
U clients2/calliope/fsfd/CFilterEngine.cpp
U clients2/calliope/fsfd/CFilterVolume.cpp
U clients2/calliope/fsfd/CFilterBase.cpp
U clients2/calliope/fsfd/CFilterEntity.cpp
U clients2/calliope/fsfd/driverMrx.h
U clients2/calliope/fsfd/CFilterContext.cpp
U clients2/calliope/fsfd/CFilterControl.h
U clients2/calliope/fsfd/CFilterPath.h
U clients2/calliope/fsfd/filfile.cpp
U clients2/calliope/fsfd/CFilterBlacklist.cpp
U clients2/calliope/fsfd/CFilterBase.h
U clients2/calliope/fsfd/CFilterControl.cpp
U clients2/calliope/fsfd/CFilterNormalizer.cpp
U clients2/calliope/lib/CDfsResolver.cpp
U clients2/calliope/lib/CFilterClientCargo.cpp
U clients2/calliope/lib/CFilterClient.cpp
U clients2/calliope/lib/CFilterClientCargoMember.h
U clients2/calliope/lib/CFilterClientPayload.cpp
U clients2/calliope/lib/CDfsResolver.h
U clients2/calliope/lib/CFilterClientCargo.h
U clients2/calliope/lib/CFilterClientCargoMember.cpp
U clients2/calliope/lib/CFilterClient.h
U clients2/shared/pgpClientLib.h
U clients2/desktop/win32/disk/diskuipage.cpp
U clients2/clientlib/win32/CLentwiz.c
U clients2/clientlib/win32/CLentwiz.h
U clients2/clientlib/win32/CLzipwiz.c
U clients2/clientlib/osx/src/CEchoLicense.h
U clients2/clientlib/osx/src/CEchoLicense.m
U clients2/clientlib/osx/PGPclient.framework.exp
U clients2/pdf/win32/test/securemail.exe
U clients2/pdf/win32/pdflib/PDFObject.h
U clients2/pdf/win32/pdflib/PDFXRefTable.cpp
U clients2/pdf/win32/pdflib/PDFXRefStream.cpp
U clients2/pdf/win32/pdflib/PDFLibrary.8.0.vcproj
U clients2/pdf/win32/pdflib/SigDict.cpp
U clients2/pdf/win32/pdflib/PDFStream.h
U clients2/pdf/win32/pdflib/PDFFont.cpp
U clients2/pdf/win32/pdflib/streamswin32.h
U clients2/pdf/win32/pdflib/PDFStream.cpp
U clients2/pdf/win32/pdflib/PDFsign.cpp
U clients2/pdf/win32/pdflib/PDFFile.cpp
U clients2/pdf/win32/pdflib/PDFBase.h
U clients2/pdf/win32/pdflib/PDFReal.h
U clients2/pdf/win32/pdflib/PDFParser.cpp
U clients2/pdf/win32/pdflib/PDFsign.h
U clients2/pdf/win32/pdflib/PDFString.cpp
U clients2/pdf/win32/pdflib/PDFObject.cpp
U clients2/pdf/win32/pdflib/PDFPage.cpp
U clients2/pdf/win32/pdflib/PDFName.cpp
U clients2/pdf/win32/pdflib/PDFReal.cpp
U clients2/pdf/win32/pdflib/SigFile.cpp
U clients2/pdf/win32/pdflib/PDFTools.cpp
U clients2/pdf/win32/pdflib/PDFParser.h
U clients2/pdf/win32/pgppdf/PDFencrypt.cpp
U clients2/pdf/win32/pgppdf/pgppdf.cpp
U clients2/pdf/win32/pgppdf/pgppdfbase.h
U clients2/pdf/win32/pgppdf/PGPpdfMail.cpp
U clients2/pdf/win32/pgppdf/pgppdf.8.0.vcproj
U clients2/pdf/win32/pgppdf/PGPpdfMail.h
A misc/proxytest/Bug12157
A misc/proxytest/Bug12157/source
U misc/proxytest/bughound/tests.xml
A misc/proxytest/Bug10843
A misc/proxytest/Bug10843/source
A misc/proxytest/Bug10843/result
U cmdln/build/unix/Makefile.in
U cmdln/build/unix/rules.mk.in
U cmdln/build/unix/defines.mk.in
U build/win32/stringsu/eng/PGPsDisk.eng.str
U build/win32/stringsu/eng/PGPsDisk.ascii.strings
U ovid/build/linux/defines.mk.in
U ovid/server/omf/modules/clustering/clustering.iml
U ovid/server/omf/modules/kodo/kodo.iml
U ovid/server/omf/modules/datalayer/xml/DataDef.xml
U ovid/server/omf/modules/datalayer/datalayer.iml
U ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/FilterTest.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/OPolicyChainsHtmlViewManager.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/ClusterMemberManagerImpl.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/DataContextImpl.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/filter/Filter.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/filter/Comparison.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/ODataContext.java
U ovid/server/omf/modules/datalayer/idl/DataCore.idl
U ovid/server/omf/modules/util/util.iml
U ovid/server/omf/modules/web/src/com/pgp/web/RequestContextBase.java
U ovid/server/omf/modules/web/web.iml
U ovid/server/omf/modules/web/build.xml
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminDirectoryUsersScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminDashboardScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminControllerServlet.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminCertScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditKeysScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditExternalUserScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminManagedDomainsScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminLoginScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminBaseScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminAVStatusScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserScreenRenderSupport.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminKeyCacheScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminScreenEventHandler.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminClusterScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditExcludedUserScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminAdminListScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditSetupScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminTrustedKeysScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMailQueueScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminErrorScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdministratorRole.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminRequestContext.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminExternalUsersScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/setup/SetupSelectMailserverScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminDailyEmail.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminSnmpScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminLogDownloadServlet.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminLogScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminWebMessengerScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminExternalUserPolicyListScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMailPolicyListScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUpdatesScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminExternalUserPolicyEditScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/OmcEvent.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminIgnitionKeysScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminKeyserverScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminSystemScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminVkdScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminLocalKeysScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminFileBlockingScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminStaticRoutesScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminNetworkScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditDesktopScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMailPolicyRuleEditScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminDictionaryListScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminServerListScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMessageTemplatesScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserScreenRenderer.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminOverviewScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMailConfigurationScreen.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminOrganizationKeyScreen.java
U ovid/server/omf/modules/omc/build.xml
U ovid/server/omf/modules/omc/omc.iml
U ovid/server/shared/oviddata/Filter.h
U ovid/server/shared/oviddata/Filter.cpp
U ovid/server/shared/oviddata/test/FilterTest.h
U ovid/server/shared/oviddata/test/FilterTest.cpp
U ovid/libs/proxy/proxytool/src/Makefile.in
U ovid/libs/proxy/proxytool/src/proxytool-main.c
U ovid/client/osx/src/CPGPUDProxy.m
U ovid/client/osx/src/CPGPUDProxy.h
U libs2/mail/src/pgpMailMIME.c
New merge ticket: a79679b3-9302-0410-9f41-d51457bc89fc:/trunk:49496
Committed revision 49577.
Syncing /pgp/local/cmdln-dev(/local/cmdln-dev) in /home/warlord/src/pgpsrc-cmdln-lib/src to 49577.
clients2/calliope - skipped
clients2/calliope/fsfd/CFilterFastIo.cpp - skipped
clients2/calliope/fsfd/CFilterCallback.cpp - skipped
clients2/calliope/fsfd/CFilterPath.cpp - skipped
clients2/calliope/fsfd/CFilterEngine.cpp - skipped
clients2/calliope/fsfd/CFilterVolume.cpp - skipped
clients2/calliope/fsfd/CFilterBase.cpp - skipped
clients2/calliope/fsfd/CFilterEntity.cpp - skipped
clients2/calliope/fsfd/driverMrx.h - skipped
clients2/calliope/fsfd/CFilterContext.cpp - skipped
clients2/calliope/fsfd/CFilterControl.h - skipped
clients2/calliope/fsfd/CFilterPath.h - skipped
clients2/calliope/fsfd/filfile.cpp - skipped
clients2/calliope/fsfd/CFilterBlacklist.cpp - skipped
clients2/calliope/fsfd/CFilterBase.h - skipped
clients2/calliope/fsfd/CFilterControl.cpp - skipped
clients2/calliope/fsfd/CFilterNormalizer.cpp - skipped
clients2/calliope/lib/CDfsResolver.cpp - skipped
clients2/calliope/lib/CFilterClientCargo.cpp - skipped
clients2/calliope/lib/CFilterClient.cpp - skipped
clients2/calliope/lib/CFilterClientCargoMember.h - skipped
clients2/calliope/lib/CFilterClientPayload.cpp - skipped
clients2/calliope/lib/CDfsResolver.h - skipped
clients2/calliope/lib/CFilterClientCargo.h - skipped
clients2/calliope/lib/CFilterClientCargoMember.cpp - skipped
clients2/calliope/lib/CFilterClient.h - skipped
clients2/shared - skipped
clients2/shared/pgpClientLib.h - skipped
clients2/desktop - skipped
clients2/desktop/win32/disk/diskuipage.cpp - skipped
clients2/clientlib - skipped
clients2/clientlib/win32/CLentwiz.c - skipped
clients2/clientlib/win32/CLentwiz.h - skipped
clients2/clientlib/win32/CLzipwiz.c - skipped
clients2/clientlib/osx/src/CEchoLicense.h - skipped
clients2/clientlib/osx/src/CEchoLicense.m - skipped
clients2/clientlib/osx/PGPclient.framework.exp - skipped
clients2/pdf - skipped
clients2/pdf/win32/test/securemail.exe - skipped
clients2/pdf/win32/pdflib/PDFObject.h - skipped
clients2/pdf/win32/pdflib/PDFXRefTable.cpp - skipped
clients2/pdf/win32/pdflib/PDFXRefStream.cpp - skipped
clients2/pdf/win32/pdflib/PDFLibrary.8.0.vcproj - skipped
clients2/pdf/win32/pdflib/SigDict.cpp - skipped
clients2/pdf/win32/pdflib/PDFStream.h - skipped
clients2/pdf/win32/pdflib/PDFFont.cpp - skipped
clients2/pdf/win32/pdflib/streamswin32.h - skipped
clients2/pdf/win32/pdflib/PDFStream.cpp - skipped
clients2/pdf/win32/pdflib/PDFsign.cpp - skipped
clients2/pdf/win32/pdflib/PDFFile.cpp - skipped
clients2/pdf/win32/pdflib/PDFBase.h - skipped
clients2/pdf/win32/pdflib/PDFReal.h - skipped
clients2/pdf/win32/pdflib/PDFParser.cpp - skipped
clients2/pdf/win32/pdflib/PDFsign.h - skipped
clients2/pdf/win32/pdflib/PDFString.cpp - skipped
clients2/pdf/win32/pdflib/PDFObject.cpp - skipped
clients2/pdf/win32/pdflib/PDFPage.cpp - skipped
clients2/pdf/win32/pdflib/PDFName.cpp - skipped
clients2/pdf/win32/pdflib/PDFReal.cpp - skipped
clients2/pdf/win32/pdflib/SigFile.cpp - skipped
clients2/pdf/win32/pdflib/PDFTools.cpp - skipped
clients2/pdf/win32/pdflib/PDFParser.h - skipped
clients2/pdf/win32/pgppdf/PDFencrypt.cpp - skipped
clients2/pdf/win32/pgppdf/pgppdf.cpp - skipped
clients2/pdf/win32/pgppdf/pgppdfbase.h - skipped
clients2/pdf/win32/pgppdf/PGPpdfMail.cpp - skipped
clients2/pdf/win32/pgppdf/pgppdf.8.0.vcproj - skipped
clients2/pdf/win32/pgppdf/PGPpdfMail.h - skipped
misc - skipped
misc/proxytest/bughound/tests.xml - skipped
U cmdln/build/unix/Makefile.in
U cmdln/build/unix/rules.mk.in
U cmdln/build/unix/defines.mk.in
U build/win32/stringsu/eng/PGPsDisk.eng.str
U build/win32/stringsu/eng/PGPsDisk.ascii.strings
ovid - skipped
ovid/build/linux/defines.mk.in - skipped
ovid/server/omf/modules/clustering/clustering.iml - skipped
ovid/server/omf/modules/kodo/kodo.iml - skipped
ovid/server/omf/modules/datalayer/xml/DataDef.xml - skipped
ovid/server/omf/modules/datalayer/datalayer.iml - skipped
ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/FilterTest.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/OPolicyChainsHtmlViewManager.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/ClusterMemberManagerImpl.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/DataContextImpl.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/filter/Filter.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/filter/Comparison.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/ODataContext.java - skipped
ovid/server/omf/modules/datalayer/idl/DataCore.idl - skipped
ovid/server/omf/modules/util/util.iml - skipped
ovid/server/omf/modules/web/src/com/pgp/web/RequestContextBase.java - skipped
ovid/server/omf/modules/web/web.iml - skipped
ovid/server/omf/modules/web/build.xml - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminDirectoryUsersScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminDashboardScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminControllerServlet.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminCertScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditKeysScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditExternalUserScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminManagedDomainsScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminLoginScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminBaseScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminAVStatusScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserScreenRenderSupport.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminKeyCacheScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminScreenEventHandler.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminClusterScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditExcludedUserScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminAdminListScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditSetupScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminTrustedKeysScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMailQueueScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminErrorScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdministratorRole.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminRequestContext.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminExternalUsersScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/setup/SetupSelectMailserverScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminDailyEmail.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminSnmpScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminLogDownloadServlet.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminLogScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminWebMessengerScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminExternalUserPolicyListScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMailPolicyListScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUpdatesScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminExternalUserPolicyEditScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/OmcEvent.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminIgnitionKeysScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminKeyserverScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminSystemScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminVkdScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminLocalKeysScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminFileBlockingScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminStaticRoutesScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminNetworkScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditDesktopScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMailPolicyRuleEditScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminDictionaryListScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminServerListScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMessageTemplatesScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserPolicyEditScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminUserScreenRenderer.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminOverviewScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminMailConfigurationScreen.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminOrganizationKeyScreen.java - skipped
ovid/server/omf/modules/omc/build.xml - skipped
ovid/server/omf/modules/omc/omc.iml - skipped
ovid/server/shared/oviddata/Filter.h - skipped
ovid/server/shared/oviddata/Filter.cpp - skipped
ovid/server/shared/oviddata/test/FilterTest.h - skipped
ovid/server/shared/oviddata/test/FilterTest.cpp - skipped
ovid/libs/proxy/proxytool/src/Makefile.in - skipped
ovid/libs/proxy/proxytool/src/proxytool-main.c - skipped
ovid/client/osx/src/CPGPUDProxy.m - skipped
ovid/client/osx/src/CPGPUDProxy.h - skipped
libs2/mail - skipped
libs2/mail/src/pgpMailMIME.c - skipped
Tue Nov 21 18:02:44 EST 2006
Auto-merging (49544, 49578) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49576).
===> Auto-merging (49544, 49554) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49553).
Merging back to mirror source svn+ssh://mars.pgp.com/svn/pgpsrc.
Enter passphrase for key '/home/warlord/.ssh/id_dsa':
Empty merge.
===> Auto-merging (49554, 49577) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49576).
Merging back to mirror source svn+ssh://mars.pgp.com/svn/pgpsrc.
Enter passphrase for key '/home/warlord/.ssh/id_dsa':
Empty merge.
===> Auto-merging (49577, 49578) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49576).
Merging back to mirror source svn+ssh://mars.pgp.com/svn/pgpsrc.
Enter passphrase for key '/home/warlord/.ssh/id_dsa':
U libs2/cmdln/src/pgpOpt.h
U libs2/cmdln/src/pgpOpt.c
New merge ticket: 4b02fed6-1982-4324-8d42-994ac65bc45c:/local/cmdln-dev:49578
Merge back committed as revision 49497.
Enter passphrase for key '/home/warlord/.ssh/id_dsa':
Syncing svn+ssh://mars.pgp.com/svn/pgpsrc
Retrieving log information from 49497 to 49497
Enter passphrase for key '/home/warlord/.ssh/id_dsa':
Committed revision 49579 from revision 49497.
Syncing svn+ssh://mars.pgp.com/svn/pgpsrc
Retrieving log information from 49498 to 49509
Committed revision 49580 from revision 49498.
Committed revision 49581 from revision 49499.
Committed revision 49582 from revision 49500.
Committed revision 49583 from revision 49501.
Committed revision 49584 from revision 49502.
Committed revision 49585 from revision 49503.
Committed revision 49586 from revision 49504.
Committed revision 49587 from revision 49505.
Committed revision 49588 from revision 49506.
Committed revision 49589 from revision 49507.
Committed revision 49590 from revision 49508.
Committed revision 49591 from revision 49509.
Auto-merging (49576, 49591) /mirrors/pgpsrc/trunk to /local/cmdln-dev (base /local/cmdln-dev:49578).
U clients2/desktop/win32/disk/WDisk.cpp
U clients2/tray/PTproc.c
U clients2/clientlib/osx/src/CEchoMasterKeysPrefsView.m
U misc/win32/pgpcheck/main.cpp
U misc/win32/pgpcheck/pgpcheck.vcproj
U ovid/server/omf/conf/defaultPolicy.zip
U ovid/server/omf/modules/boom/web/BoomerangInitialLogin.html
U ovid/server/omf/modules/boom/web/BoomerangOptions.html
U ovid/server/omf/modules/boom/web/resources/BoomerangOptions.properties
U ovid/server/omf/modules/boom/web/resources/BoomerangInitialLogin.properties
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenCpp.java
U ovid/server/shared/oviddata/OData.h
U ovid/server/shared/oviddata/Filter.cpp
U ovid/server/shared/oviddata/test/MessageTemplateTest.cpp
U ovid/server/shared/oviddata/test/BoomerangUserEmailTest.cpp
U ovid/server/shared/oviddata/test/FilterTest.cpp
U ovid/server/shared/oviddata/OService.cpp
U ovid/server/shared/oviddata/OData.cpp
U ovid/server/scripts/db/db_data.sql
U ovid/server/migration/readme-migration.txt
A ovid/server/migration/2.5.2.4038
A ovid/server/migration/2.5.2.4038/newDefaultPolicy.zip
A ovid/server/migration/2.5.2.4038/migrate.sh
U ovid/shared/pgpOvidSrvComm.c
U ovid/shared/pgpOvidSrvCommTest.c
U ovid/shared/pgpOvidSrvCommPriv.h
U ovid/shared/pgpOvidSrvCommPlatform.h
U ovid/client/osx/src/CPGPUDProxy.m
U libs2/pgpsdk/priv/rpc/pgpRPCBackEnd.c
New merge ticket: a79679b3-9302-0410-9f41-d51457bc89fc:/trunk:49509
Committed revision 49592.
Syncing /pgp/local/cmdln-dev(/local/cmdln-dev) in /home/warlord/src/pgpsrc-cmdln-lib/src to 49592.
clients2/desktop - skipped
clients2/desktop/win32/disk/WDisk.cpp - skipped
clients2/tray - skipped
clients2/tray/PTproc.c - skipped
clients2/clientlib - skipped
clients2/clientlib/osx/src/CEchoMasterKeysPrefsView.m - skipped
misc - skipped
misc/win32/pgpcheck/main.cpp - skipped
misc/win32/pgpcheck/pgpcheck.vcproj - skipped
ovid - skipped
ovid/server/omf/conf/defaultPolicy.zip - skipped
ovid/server/omf/modules/boom/web/BoomerangInitialLogin.html - skipped
ovid/server/omf/modules/boom/web/BoomerangOptions.html - skipped
ovid/server/omf/modules/boom/web/resources/BoomerangOptions.properties - skipped
ovid/server/omf/modules/boom/web/resources/BoomerangInitialLogin.properties - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenCpp.java - skipped
ovid/server/shared/oviddata/OData.h - skipped
ovid/server/shared/oviddata/Filter.cpp - skipped
ovid/server/shared/oviddata/test/MessageTemplateTest.cpp - skipped
ovid/server/shared/oviddata/test/BoomerangUserEmailTest.cpp - skipped
ovid/server/shared/oviddata/test/FilterTest.cpp - skipped
ovid/server/shared/oviddata/OService.cpp - skipped
ovid/server/shared/oviddata/OData.cpp - skipped
ovid/server/scripts/db/db_data.sql - skipped
ovid/server/migration/readme-migration.txt - skipped
ovid/shared/pgpOvidSrvComm.c - skipped
ovid/shared/pgpOvidSrvCommTest.c - skipped
ovid/shared/pgpOvidSrvCommPriv.h - skipped
ovid/shared/pgpOvidSrvCommPlatform.h - skipped
ovid/client/osx/src/CPGPUDProxy.m - skipped
U libs2/pgpsdk/priv/rpc/pgpRPCBackEnd.c
Auto-merging (49578, 49593) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49591).
===> Auto-merging (49578, 49592) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49591).
Merging back to mirror source svn+ssh://mars.pgp.com/svn/pgpsrc.
Empty merge.
===> Auto-merging (49592, 49593) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49591).
Merging back to mirror source svn+ssh://mars.pgp.com/svn/pgpsrc.
U libs2/cmdln/src/pgpOpt.h
U libs2/cmdln/src/pgpOpt.c
New merge ticket: 4b02fed6-1982-4324-8d42-994ac65bc45c:/local/cmdln-dev:49593
Merge back committed as revision 49516.
Syncing svn+ssh://mars.pgp.com/svn/pgpsrc
Retrieving log information from 49510 to 49516
Committed revision 49594 from revision 49510.
Committed revision 49595 from revision 49511.
Committed revision 49596 from revision 49512.
Committed revision 49597 from revision 49513.
Committed revision 49598 from revision 49514.
Committed revision 49599 from revision 49515.
Committed revision 49600 from revision 49516.
Wed Nov 22 17:46:52 EST 2006
Syncing svn+ssh://mars.pgp.com/svn/pgpsrc
Auto-merging (49591, 49600) /mirrors/pgpsrc/trunk to /local/cmdln-dev (base /local/cmdln-dev:49593).
U misc/schedule/PGP-Engineering-Schedule.xls
U ovid/server/omf/modules/vkd/web/resources/VKDCaptcha_es.properties
U ovid/server/omf/modules/vkd/web/resources/VKDCaptcha_ja.properties
U ovid/design/arcadia/DataLayerUsersGuide.doc
New merge ticket: a79679b3-9302-0410-9f41-d51457bc89fc:/trunk:49516
Committed revision 49601.
Syncing /pgp/local/cmdln-dev(/local/cmdln-dev) in /home/warlord/src/pgpsrc-cmdln-lib/src to 49601.
misc - skipped
misc/schedule/PGP-Engineering-Schedule.xls - skipped
ovid - skipped
ovid/server/omf/modules/vkd/web/resources/VKDCaptcha_es.properties - skipped
ovid/server/omf/modules/vkd/web/resources/VKDCaptcha_ja.properties - skipped
ovid/design/arcadia/DataLayerUsersGuide.doc - skipped
Syncing svn+ssh://mars.pgp.com/svn/pgpsrc
Retrieving log information from 49517 to 49580
Committed revision 49602 from revision 49517.
Committed revision 49603 from revision 49518.
Committed revision 49604 from revision 49519.
Committed revision 49605 from revision 49520.
Committed revision 49606 from revision 49521.
Committed revision 49607 from revision 49522.
Committed revision 49608 from revision 49523.
Committed revision 49609 from revision 49524.
Committed revision 49610 from revision 49525.
Committed revision 49611 from revision 49526.
Committed revision 49612 from revision 49527.
Committed revision 49613 from revision 49528.
Committed revision 49614 from revision 49529.
Committed revision 49615 from revision 49530.
Committed revision 49616 from revision 49531.
Committed revision 49617 from revision 49532.
Committed revision 49618 from revision 49533.
Committed revision 49619 from revision 49534.
Committed revision 49620 from revision 49535.
Committed revision 49621 from revision 49536.
Committed revision 49622 from revision 49537.
Committed revision 49623 from revision 49538.
Committed revision 49624 from revision 49539.
Committed revision 49625 from revision 49540.
Committed revision 49626 from revision 49541.
Committed revision 49627 from revision 49542.
Committed revision 49628 from revision 49543.
Committed revision 49629 from revision 49544.
Committed revision 49630 from revision 49545.
Committed revision 49631 from revision 49546.
Committed revision 49632 from revision 49547.
Committed revision 49633 from revision 49548.
Committed revision 49634 from revision 49549.
Committed revision 49635 from revision 49550.
Committed revision 49636 from revision 49551.
Committed revision 49637 from revision 49552.
Committed revision 49638 from revision 49553.
Committed revision 49639 from revision 49554.
Committed revision 49640 from revision 49555.
Committed revision 49641 from revision 49556.
Committed revision 49642 from revision 49557.
Committed revision 49643 from revision 49558.
Committed revision 49644 from revision 49559.
Committed revision 49645 from revision 49560.
Committed revision 49646 from revision 49561.
Committed revision 49647 from revision 49562.
Committed revision 49648 from revision 49563.
Committed revision 49649 from revision 49564.
Committed revision 49650 from revision 49565.
Committed revision 49651 from revision 49566.
Committed revision 49652 from revision 49567.
Committed revision 49653 from revision 49568.
Committed revision 49654 from revision 49569.
Committed revision 49655 from revision 49570.
Committed revision 49656 from revision 49571.
Committed revision 49657 from revision 49572.
Committed revision 49658 from revision 49573.
Committed revision 49659 from revision 49574.
Committed revision 49660 from revision 49575.
Committed revision 49661 from revision 49576.
Committed revision 49662 from revision 49577.
Committed revision 49663 from revision 49578.
Committed revision 49664 from revision 49579.
Committed revision 49665 from revision 49580.
Auto-merging (49600, 49662) /mirrors/pgpsrc/trunk to /local/cmdln-dev (base /mirrors/pgpsrc/trunk:49600).
U clients2/wde/bootguard/stage2/asm.S
U clients2/wde/bootguard/stage2/auth.c
U clients2/wde/bootguard/stage2/auth.h
U clients2/wde/bootguard/stage2/stage2.c
U clients2/wde/bootguard/modules/Makefile.am
U clients2/wde/bootguard/modules/pgpTokenInterface.c
A clients2/wde/bootguard/modules/pgpTpmInterface.c
U clients2/wde/bootguard/modules/pgpSDKInterface.c
U clients2/wde/bootguard/bgfs-def
U clients2/wde/bg-modules/configure.ac
U clients2/wde/bg-modules/include/pgpBGModule.h
A clients2/wde/bg-modules/include/pgpTpmInterface.h
A clients2/wde/bg-modules/bg-tpm
A clients2/wde/bg-modules/bg-tpm/pgpTpmUnseal.c
A clients2/wde/bg-modules/bg-tpm/pgpTpmHmac.c
A clients2/wde/bg-modules/bg-tpm/pgpTpmSha.c
A clients2/wde/bg-modules/bg-tpm/Makefile.am
A clients2/wde/bg-modules/bg-tpm/pgpTpmInterface.c
A clients2/wde/bg-modules/bg-tpm/bgtpm.ld.conf
A clients2/wde/bg-modules/bg-tpm/pgpTpmPriv.h
U clients2/wde/bg-modules/Makefile.am
A clients2/wde/efi/driver/xp/build.cmd
A clients2/wde/efi/driver/xp/PGPwdeDriver.c
A clients2/wde/efi/driver/xp/PGPwdeDriverBootScreen.bmp
A clients2/wde/efi/driver/xp/efiGraphicsOutput.h
A clients2/wde/efi/driver/xp/Makefile
A clients2/wde/efi/driver/xp/efiConsoleControl.h
U clients2/wde/engine/win32/src/CPGPwdeUserContext.cpp
U clients2/wde/wdelib/include/bgfs.h
U clients2/wde/wdelib/include/pgpWDEUser.h
A clients2/wde/wdelib/src/pgpWDETpm.c
A clients2/wde/wdelib/src/pgpWDETpmPriv.h
U clients2/wde/wdelib/src/bgfsname.c
U clients2/wde/wdelib/src/pgpWDEUser.c
U clients2/wde/wdelib/src/pgpSDKInterface-OS.c
U clients2/wde/wdelib/src/pgpSDKInterface-OS-full.c
U clients2/wde/wdelib/src/pgpWDEUserPriv.h
U clients2/wde/wdelib/src/pgpSDKInterface-bootguard.c
U clients2/wde/shared/pgpWDEUserPubDefs.h
U clients2/calliope/fsfd/CFilterWiper.h
U clients2/calliope/fsfd/IoControl.h
U clients2/calliope/fsfd/CFilterEngine.cpp
U clients2/calliope/fsfd/CFilterBase.cpp
U clients2/calliope/fsfd/CFilterControl.h
U clients2/calliope/fsfd/CFilterWiper.cpp
U clients2/calliope/fsfd/CFilterEngine.h
U clients2/calliope/fsfd/CFilterBase.h
U clients2/calliope/fsfd/CFilterControl.cpp
U clients2/calliope/lib/CFilterClient.cpp
U clients2/calliope/lib/CFilterClient.h
U clients2/shared/win32/pgpClientLibWin32.h
U clients2/tray/ptwde.cpp
U clients2/clientlib/win32/CFilterWiperClient.cpp
U clients2/clientlib/win32/CFilterWiperClient.h
U clients2/clientlib/win32/CLwipeHelper.cpp
U clients2/clientlib/osx/src/CEchoKeyInfo.m
U clients2/clientlib/osx/Japanese.lproj/CEchoKeyInfo.nib/info.nib
U clients2/clientlib/osx/Japanese.lproj/CEchoKeyInfo.nib/keyedobjects.nib
U clients2/echo/osx/src/CEchoDiskController.mm
A misc/proxytest/Bug11257
A misc/proxytest/Bug11257/source
A misc/proxytest/Bug11257/decoded
U misc/win32/pgpcheck/pgpcheck.vcproj
U misc/pgpwdeuser/pgpWDEUserUtil.c
U misc/pgpwdeuser/pgpWDEUserMgr.c
U misc/schedule/PGP-Engineering-Schedule.xls
U cmdln/build/unix/rules.mk.in
U cmdln/build/unix/configure.in
U cmdln/src/Makefile.in
U cmdln/src/cmdln-cpu-utils.c
U cmdln/src/cmdln-common.h
U cmdln/src/cmdln-decode.c
U ovid/build/linux/ovidserver.spec
U ovid/build/linux/Makefile.in
A ovid/server/omf/modules/boom/web/WMTopNavInclude.html
A ovid/server/omf/modules/boom/web/WMHelp.html
U ovid/server/omf/modules/datagen/xml/DataDef.xsd
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/Unparser.java
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/Model.java
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenIDL.java
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/DDTokens.java
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenJava.java
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenCpp.java
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/Parser.java
U ovid/server/omf/modules/datalayer/xml/DataDef.xml
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenUpdate.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenSQL.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenDelete.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenInsert.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/ClusterMemberManagerImpl.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/DatalayerClusterConfig.java
D ovid/server/omf/modules/datalayer/idl/DataTypes.idl
U ovid/server/omf/modules/datalayer/build.xml
U ovid/server/omf/modules/omc/web/admin/help/Frames/mail-policy-poster.pdf
U ovid/server/shared/ovidserver-keylocator.cpp
U ovid/server/shared/oviddata/Makefile.in
U ovid/server/shared/oviddata/OClasses.cpp
U ovid/server/pgpsyncd/pgpsyncd-client.c
U ovid/server/pgpsysconf/pgpsysconf-network.c
U ovid/server/pgpbackup/pgpbackup.c
U ovid/libs/dyndebug/src/pgpDynamicDebugClient.c
U ovid/libs/proxy/src/pgpProxyLib.c
U ovid/client/win32/tray/OCproxy.c
U ovid/client/win32/mapi/OutMessage.cpp
U libs2/mail/include/pgpCharsetUtilities.h
U libs2/mail/src/pgpMailEncrypt.c
U libs2/mail/src/pgpMailDecrypt.c
U libs2/mail/src/pgpCharsetUtilities.c
U libs2/pgpsdk/priv/crypto/pubkey/pgpPublicKey.c
U libs2/pgpsdk/priv/crypto/pubkey/pgpP11Key.c
U libs2/pgpsdk/priv/crypto/pubkey/pgpMakeSig.c
U libs2/pgpsdk/priv/crypto/pubkey/pgpESK.c
U libs2/pgpsdk/priv/crypto/pubkey/pgpESK.h
U libs2/pgpsdk/priv/crypto/encoding/pgpClientEncode.c
U libs2/pgpsdk/priv/crypto/encoding/pgpEncode.c
U libs2/pgpsdk/priv/crypto/encoding/pgpDecode.c
U libs2/pgpsdk/priv/crypto/keys/pgpX509Subkeys.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyIO.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyMan.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyPriv.h
U libs2/pgpsdk/priv/crypto/keys/pgpKeyAdd.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyBack.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyObj.c
U libs2/pgpsdk/priv/lang/PGPsdk.eng.strings
U libs2/pgpsdk/priv/rpc/pgpRPCMessagePack.c
U libs2/pgpsdk/priv/rpc/pgpRPCServer.c
U libs2/pgpsdk/priv/rpc/pgpRPCKeyBack.c
U libs2/pgpsdk/priv/utilities/pgpPassCach.c
U libs2/pgpsdk/priv/utilities/pgpPassCach.h
U libs2/pgpsdk/priv/utilities/pgpContext.c
U libs2/pgpsdk/priv/utilities/pgpOptionListPriv.h
U libs2/pgpsdk/win32/PGPsdk/PGPsdk.def
U libs2/pgpsdk/configure.in
U libs2/pgpsdk/pub/include/pgpKeys.h
U libs2/pgpsdk/pub/include/pgpOptionList.h
U libs2/pgpsdk/osx/pgp-agent/pgp-agent.xcodeproj/project.pbxproj
U libs2/pgpsdk/osx/framework/PGP.framework.exp
U libs2/pgpsdk/osx/framework/PGP.framework.xcodeproj/project.pbxproj
A + libs2/messaging/priv
A + libs2/messaging/priv/pgpMsgPrivate.h
A libs2/messaging/win32
A libs2/messaging/win32/PGPMessaging
A libs2/messaging/win32/PGPMessaging/PGPMessaging.vcproj
A libs2/messaging/win32/PGPMessaging/PGPMessagingLibDLLMain.cpp
A + libs2/messaging/pub
U libs2/messaging/pub/pgpMsg.h
D libs2/messaging/pub/pgpMsgPrivate.h
D libs2/messaging/include
D libs2/messaging/src
New merge ticket: a79679b3-9302-0410-9f41-d51457bc89fc:/trunk:49577
Committed revision 49666.
Syncing /pgp/local/cmdln-dev(/local/cmdln-dev) in /home/warlord/src/pgpsrc-cmdln-lib/src to 49666.
clients2/wde - skipped
clients2/wde/bootguard/stage2/asm.S - skipped
clients2/wde/bootguard/stage2/auth.c - skipped
clients2/wde/bootguard/stage2/auth.h - skipped
clients2/wde/bootguard/stage2/stage2.c - skipped
clients2/wde/bootguard/modules/Makefile.am - skipped
clients2/wde/bootguard/modules/pgpTokenInterface.c - skipped
clients2/wde/bootguard/modules/pgpSDKInterface.c - skipped
clients2/wde/bootguard/bgfs-def - skipped
clients2/wde/bg-modules/configure.ac - skipped
clients2/wde/bg-modules/include/pgpBGModule.h - skipped
clients2/wde/bg-modules/Makefile.am - skipped
clients2/wde/engine/win32/src/CPGPwdeUserContext.cpp - skipped
clients2/wde/wdelib/include/bgfs.h - skipped
clients2/wde/wdelib/include/pgpWDEUser.h - skipped
clients2/wde/wdelib/src/bgfsname.c - skipped
clients2/wde/wdelib/src/pgpWDEUser.c - skipped
clients2/wde/wdelib/src/pgpSDKInterface-OS.c - skipped
clients2/wde/wdelib/src/pgpSDKInterface-OS-full.c - skipped
clients2/wde/wdelib/src/pgpWDEUserPriv.h - skipped
clients2/wde/wdelib/src/pgpSDKInterface-bootguard.c - skipped
clients2/wde/shared/pgpWDEUserPubDefs.h - skipped
clients2/calliope - skipped
clients2/calliope/fsfd/CFilterWiper.h - skipped
clients2/calliope/fsfd/IoControl.h - skipped
clients2/calliope/fsfd/CFilterEngine.cpp - skipped
clients2/calliope/fsfd/CFilterBase.cpp - skipped
clients2/calliope/fsfd/CFilterControl.h - skipped
clients2/calliope/fsfd/CFilterWiper.cpp - skipped
clients2/calliope/fsfd/CFilterEngine.h - skipped
clients2/calliope/fsfd/CFilterBase.h - skipped
clients2/calliope/fsfd/CFilterControl.cpp - skipped
clients2/calliope/lib/CFilterClient.cpp - skipped
clients2/calliope/lib/CFilterClient.h - skipped
clients2/shared - skipped
clients2/shared/win32/pgpClientLibWin32.h - skipped
clients2/tray - skipped
clients2/tray/ptwde.cpp - skipped
clients2/clientlib - skipped
clients2/clientlib/win32/CFilterWiperClient.cpp - skipped
clients2/clientlib/win32/CFilterWiperClient.h - skipped
clients2/clientlib/win32/CLwipeHelper.cpp - skipped
clients2/clientlib/osx/src/CEchoKeyInfo.m - skipped
clients2/clientlib/osx/Japanese.lproj/CEchoKeyInfo.nib/info.nib - skipped
clients2/clientlib/osx/Japanese.lproj/CEchoKeyInfo.nib/keyedobjects.nib - skipped
clients2/echo - skipped
clients2/echo/osx/src/CEchoDiskController.mm - skipped
misc - skipped
misc/win32/pgpcheck/pgpcheck.vcproj - skipped
misc/pgpwdeuser/pgpWDEUserUtil.c - skipped
misc/pgpwdeuser/pgpWDEUserMgr.c - skipped
misc/schedule/PGP-Engineering-Schedule.xls - skipped
U cmdln/build/unix/rules.mk.in
U cmdln/build/unix/configure.in
U cmdln/src/Makefile.in
U cmdln/src/cmdln-cpu-utils.c
U cmdln/src/cmdln-common.h
U cmdln/src/cmdln-decode.c
ovid - skipped
ovid/build/linux/ovidserver.spec - skipped
ovid/build/linux/Makefile.in - skipped
ovid/server/omf/modules/datagen/xml/DataDef.xsd - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/Unparser.java - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/Model.java - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenIDL.java - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/DDTokens.java - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenJava.java - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenCpp.java - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/Parser.java - skipped
ovid/server/omf/modules/datalayer/xml/DataDef.xml - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenUpdate.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenSQL.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenDelete.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenInsert.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/ClusterMemberManagerImpl.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/DatalayerClusterConfig.java - skipped
ovid/server/omf/modules/datalayer/build.xml - skipped
ovid/server/omf/modules/omc/web/admin/help/Frames/mail-policy-poster.pdf - skipped
ovid/server/shared/ovidserver-keylocator.cpp - skipped
ovid/server/shared/oviddata/Makefile.in - skipped
ovid/server/shared/oviddata/OClasses.cpp - skipped
ovid/server/pgpsyncd/pgpsyncd-client.c - skipped
ovid/server/pgpsysconf/pgpsysconf-network.c - skipped
ovid/server/pgpbackup/pgpbackup.c - skipped
ovid/libs/dyndebug/src/pgpDynamicDebugClient.c - skipped
ovid/libs/proxy/src/pgpProxyLib.c - skipped
ovid/client/win32/tray/OCproxy.c - skipped
ovid/client/win32/mapi/OutMessage.cpp - skipped
libs2/mail - skipped
libs2/mail/include/pgpCharsetUtilities.h - skipped
libs2/mail/src/pgpMailEncrypt.c - skipped
libs2/mail/src/pgpMailDecrypt.c - skipped
libs2/mail/src/pgpCharsetUtilities.c - skipped
U libs2/pgpsdk/priv/crypto/pubkey/pgpPublicKey.c
U libs2/pgpsdk/priv/crypto/pubkey/pgpP11Key.c
U libs2/pgpsdk/priv/crypto/pubkey/pgpMakeSig.c
U libs2/pgpsdk/priv/crypto/pubkey/pgpESK.c
U libs2/pgpsdk/priv/crypto/pubkey/pgpESK.h
U libs2/pgpsdk/priv/crypto/encoding/pgpClientEncode.c
U libs2/pgpsdk/priv/crypto/encoding/pgpEncode.c
U libs2/pgpsdk/priv/crypto/encoding/pgpDecode.c
U libs2/pgpsdk/priv/crypto/keys/pgpX509Subkeys.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyIO.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyMan.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyPriv.h
U libs2/pgpsdk/priv/crypto/keys/pgpKeyAdd.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyBack.c
U libs2/pgpsdk/priv/crypto/keys/pgpKeyObj.c
U libs2/pgpsdk/priv/lang/PGPsdk.eng.strings
U libs2/pgpsdk/priv/rpc/pgpRPCMessagePack.c
U libs2/pgpsdk/priv/rpc/pgpRPCServer.c
U libs2/pgpsdk/priv/rpc/pgpRPCKeyBack.c
U libs2/pgpsdk/priv/utilities/pgpPassCach.c
U libs2/pgpsdk/priv/utilities/pgpPassCach.h
U libs2/pgpsdk/priv/utilities/pgpContext.c
U libs2/pgpsdk/priv/utilities/pgpOptionListPriv.h
U libs2/pgpsdk/win32/PGPsdk/PGPsdk.def
U libs2/pgpsdk/configure.in
U libs2/pgpsdk/pub/include/pgpKeys.h
U libs2/pgpsdk/pub/include/pgpOptionList.h
U libs2/pgpsdk/osx/pgp-agent/pgp-agent.xcodeproj/project.pbxproj
U libs2/pgpsdk/osx/framework/PGP.framework.exp
U libs2/pgpsdk/osx/framework/PGP.framework.xcodeproj/project.pbxproj
libs2/messaging - skipped
Syncing svn+ssh://mars.pgp.com/svn/pgpsrc
Retrieving log information from 49581 to 49625
Committed revision 49667 from revision 49581.
Committed revision 49668 from revision 49582.
Committed revision 49669 from revision 49583.
Committed revision 49670 from revision 49584.
Committed revision 49671 from revision 49585.
Committed revision 49672 from revision 49586.
Committed revision 49673 from revision 49587.
Committed revision 49674 from revision 49588.
Committed revision 49675 from revision 49589.
Committed revision 49676 from revision 49590.
Committed revision 49677 from revision 49591.
Committed revision 49678 from revision 49592.
Committed revision 49679 from revision 49593.
Committed revision 49680 from revision 49594.
Committed revision 49681 from revision 49595.
Committed revision 49682 from revision 49596.
Committed revision 49683 from revision 49597.
Committed revision 49684 from revision 49598.
Committed revision 49685 from revision 49599.
Committed revision 49686 from revision 49600.
Committed revision 49687 from revision 49601.
Committed revision 49688 from revision 49602.
Committed revision 49689 from revision 49603.
Committed revision 49690 from revision 49604.
Committed revision 49691 from revision 49605.
Committed revision 49692 from revision 49606.
Committed revision 49693 from revision 49607.
Committed revision 49694 from revision 49608.
Committed revision 49695 from revision 49609.
Committed revision 49696 from revision 49610.
Committed revision 49697 from revision 49611.
Committed revision 49698 from revision 49612.
Committed revision 49699 from revision 49613.
Committed revision 49700 from revision 49614.
Committed revision 49701 from revision 49615.
Committed revision 49702 from revision 49616.
Committed revision 49703 from revision 49617.
Committed revision 49704 from revision 49618.
Committed revision 49705 from revision 49619.
Committed revision 49706 from revision 49620.
Committed revision 49707 from revision 49621.
Committed revision 49708 from revision 49622.
Committed revision 49709 from revision 49623.
Committed revision 49710 from revision 49624.
Committed revision 49711 from revision 49625.
Auto-merging (49662, 49710) /mirrors/pgpsrc/trunk to /local/cmdln-dev (base /mirrors/pgpsrc/trunk:49662).
U external/pre-built/zlib/1.2.3/HP-UX_B.11.11/lib/libz.sl.1.2.3
U external/pre-built/env.sh
U external/pre-built/libiconv/1.11/HP-UX_B.11.11/lib/libcharset.a
U external/pre-built/libiconv/1.11/HP-UX_B.11.11/lib/libiconv.sl.6.0
U external/pre-built/libiconv/1.11/HP-UX_B.11.11/lib/libcharset.sl.1.0
U external/pre-built/libxml2/2.6.26/HP-UX_B.11.11/lib/libxml2.sl.8.26
U external/pre-built/libxml2/2.6.26/HP-UX_B.11.11/lib/libxml2.a
U external/pre-built/libxml2/README
A external/pre-built/gcc/4.1.1/HP-UX_B.11.11/libgcc_s.4
U clients2/wde/pgpwde/src/PGPwdeParser.cpp
U clients2/wde/pgpwde/src/wdeCmdLnContext.h
U clients2/wde/pgpwde/src/wdeUserManager.cpp
U clients2/wde/pgpwde/src/PGPwdeParserFlags.cpp
U clients2/wde/pgpwde/src/PGPwdeParserFlags.h
U clients2/wde/wdedriver/win32/drvNT/src/CPGPwdeFDEDiskEncryption.cpp
U clients2/wde/wdedriver/win32/drvNT/src/CPGPwdeFilterDeviceExtension.h
U clients2/wde/wdedriver/win32/drvNT/src/CPGPwdeFDEDeviceInfoAndStatus.cpp
U clients2/wde/bg-modules/bg-tpm/pgpTpmUnseal.c
U clients2/wde/bg-modules/bg-tpm/pgpTpmInterface.c
U clients2/wde/pgpsdkm/priv/pKeyMisc.c
U clients2/wde/pgpsdkm/pub/pgpSDKAPINamespace.h
U clients2/wde/engine/win32/src/CPGPwdeUserContext.cpp
U clients2/wde/engine/win32/src/CPGPwdeUserManager.cpp
A clients2/wde/wdelib/src/pgpWDETpmTss.h
U clients2/wde/wdelib/src/pgpWDETpm.c
U clients2/wde/wdelib/src/pgpWDEUser.c
U clients2/wde/wdelib/src/pgpSDKInterface-OS.c
U clients2/wde/wdelib/src/pgpSDKInterface-bootguard.c
U clients2/wde/wdelib/wdelib-full.8.0.vcproj
U clients2/wde/shared/PGPwdeEngine.h
U clients2/desktop/win32/disk/diskobjects.cpp
U clients2/tray/ptwde.cpp
U clients2/clientlib/win32/CLzipwiz.c
U clients2/clientlib/osx/German.lproj/Localizable.strings
U misc/proxytest/Bug7038/source
A misc/proxytest/Bug12045/evil_source
A misc/proxytest/Bug12046
A misc/proxytest/Bug12046/source
A misc/proxytest/Bug12046/key.asc
A misc/proxytest/Bug11953
A misc/proxytest/Bug11953/source
A misc/proxytest/Bug11953/key.asc
U misc/proxytest/Bug7532/source
U misc/proxytest/Bug7532/key.asc
U misc/proxytest/Bug7538/key.asc
UU misc/proxytest/Bug7697/source1.txt
UU misc/proxytest/Bug7697/source2.txt
UU misc/proxytest/Bug7697/source3.txt
UU misc/proxytest/Bug7697/signed2.txt
UU misc/proxytest/Bug7697/source7036.txt
U misc/proxytest/bughound/tests.xml
A misc/proxytest/Bug11805
A misc/proxytest/Bug11805/source
A misc/proxytest/Bug11805/key.asc
A misc/proxytest/Bug11846
A misc/proxytest/Bug11846/source
U misc/proxytest/Bug7260/source
U misc/proxytest/Bug7544/source3
A misc/proxytest/Bug11537
A misc/proxytest/Bug11537/source
U misc/schedule/PGP-Engineering-Schedule.xls
U cmdln/build/unix/pgpcmdln_hpux.psf
U ovid/server/omf/conf/omf.properties
U ovid/server/omf/modules/sdk/sdk.iml
U ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenJava.java
U ovid/server/omf/modules/datalayer/xml/DataDef.xml
U ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/PrefSetTest.java
U ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/PrefDataTest.java
U ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/PrefContainerTest.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/OService.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/remote/RemoteOService.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/PersistenceContext.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/PrefDataManagerImpl.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/ServiceImpl.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/PrefContainerManagerImpl.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/PrefSetManagerImpl.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/corba/NamingUtil.java
U ovid/server/omf/modules/datalayer/build.xml
U ovid/server/omf/modules/util/src/com/pgp/util/OmfProperties.java
U ovid/server/omf/modules/omc/src/com/pgp/omc/AdminControllerServlet.java
U ovid/server/shared/ovidserver-prefs.c
U ovid/server/shared/ovidserver-db-trustedkey.c
U ovid/server/shared/ovidserver-db-trustedkey.h
U ovid/server/shared/ovidserver-ldap-cache.cpp
U ovid/server/shared/ovidserver-db.h
U ovid/server/shared/ovidserver-dictionary.cpp
U ovid/server/pgpkeymaint/pgpkeymaint-keys.c
U ovid/server/migration/readme-migration.txt
A ovid/server/migration/2.5.2.4046
A ovid/server/migration/2.5.2.4046/migrate.sh
U ovid/server/pgpupdate/pgpupdate.c
U ovid/libs/proxy/proxytool/src/proxytool-main.c
U ovid/client/osx/src/CPGPUDKeyGen.h
U ovid/client/osx/src/CPGPUDKeyGen.m
UU libs2/pfl/win32/RainbowProgress.c
U libs2/mail/src/pgpMailDecrypt.c
U libs2/pgpsdk/priv/crypto/encoding/pgpDecode.c
U libs2/pgpsdk/priv/rpc/pgpRPCServer.c
U libs2/pgpsdk/priv/smime/pgpSMIMEasnDecrypt.c
U libs2/pgpsdk/priv/utilities/pgpPassCach.c
U libs2/pgpsdk/win32/PGPsdk/PGPsdk.def
U libs2/pgpsdk/win32/PGPsdkUILib/PGPsdkUI.8.0.vcproj
U libs2/pgpsdk/unix/pgp-agent/Makefile.in
U libs2/pgpsdk/unix/config/defines.mk.in
U libs2/pgpsdk/pub/include/pgpKeys.h
U libs2/pgpsdk/pub/samples/optest/optest.xcodeproj/project.pbxproj
U libs2/pgpsdk/osx/framework/PGP.framework.exp
U libs2/pgpsdk/osx/framework/PGP.framework.xcodeproj/project.pbxproj
New merge ticket: a79679b3-9302-0410-9f41-d51457bc89fc:/trunk:49624
Committed revision 49712.
Syncing /pgp/local/cmdln-dev(/local/cmdln-dev) in /home/warlord/src/pgpsrc-cmdln-lib/src to 49712.
external - skipped
external/pre-built/zlib/1.2.3/HP-UX_B.11.11/lib/libz.sl.1.2.3 - skipped
external/pre-built/env.sh - skipped
external/pre-built/libiconv/1.11/HP-UX_B.11.11/lib/libcharset.a - skipped
external/pre-built/libiconv/1.11/HP-UX_B.11.11/lib/libiconv.sl.6.0 - skipped
external/pre-built/libiconv/1.11/HP-UX_B.11.11/lib/libcharset.sl.1.0 - skipped
external/pre-built/libxml2/2.6.26/HP-UX_B.11.11/lib/libxml2.sl.8.26 - skipped
external/pre-built/libxml2/2.6.26/HP-UX_B.11.11/lib/libxml2.a - skipped
external/pre-built/libxml2/README - skipped
clients2/wde - skipped
clients2/wde/pgpwde/src/PGPwdeParser.cpp - skipped
clients2/wde/pgpwde/src/wdeCmdLnContext.h - skipped
clients2/wde/pgpwde/src/wdeUserManager.cpp - skipped
clients2/wde/pgpwde/src/PGPwdeParserFlags.cpp - skipped
clients2/wde/pgpwde/src/PGPwdeParserFlags.h - skipped
clients2/wde/wdedriver/win32/drvNT/src/CPGPwdeFDEDiskEncryption.cpp - skipped
clients2/wde/wdedriver/win32/drvNT/src/CPGPwdeFilterDeviceExtension.h - skipped
clients2/wde/wdedriver/win32/drvNT/src/CPGPwdeFDEDeviceInfoAndStatus.cpp - skipped
clients2/wde/bg-modules/bg-tpm/pgpTpmUnseal.c - skipped
clients2/wde/bg-modules/bg-tpm/pgpTpmInterface.c - skipped
clients2/wde/pgpsdkm/priv/pKeyMisc.c - skipped
clients2/wde/pgpsdkm/pub/pgpSDKAPINamespace.h - skipped
clients2/wde/engine/win32/src/CPGPwdeUserContext.cpp - skipped
clients2/wde/engine/win32/src/CPGPwdeUserManager.cpp - skipped
clients2/wde/wdelib/src/pgpWDETpm.c - skipped
clients2/wde/wdelib/src/pgpWDEUser.c - skipped
clients2/wde/wdelib/src/pgpSDKInterface-OS.c - skipped
clients2/wde/wdelib/src/pgpSDKInterface-bootguard.c - skipped
clients2/wde/wdelib/wdelib-full.8.0.vcproj - skipped
clients2/wde/shared/PGPwdeEngine.h - skipped
clients2/desktop - skipped
clients2/desktop/win32/disk/diskobjects.cpp - skipped
clients2/tray - skipped
clients2/tray/ptwde.cpp - skipped
clients2/clientlib - skipped
clients2/clientlib/win32/CLzipwiz.c - skipped
clients2/clientlib/osx/German.lproj/Localizable.strings - skipped
misc - skipped
misc/proxytest/Bug7038/source - skipped
misc/proxytest/Bug7532/source - skipped
misc/proxytest/Bug7532/key.asc - skipped
misc/proxytest/Bug7538/key.asc - skipped
misc/proxytest/Bug7697/source1.txt - skipped
misc/proxytest/Bug7697/source2.txt - skipped
misc/proxytest/Bug7697/source3.txt - skipped
misc/proxytest/Bug7697/signed2.txt - skipped
misc/proxytest/Bug7697/source7036.txt - skipped
misc/proxytest/bughound/tests.xml - skipped
misc/proxytest/Bug7260/source - skipped
misc/proxytest/Bug7544/source3 - skipped
misc/schedule/PGP-Engineering-Schedule.xls - skipped
U cmdln/build/unix/pgpcmdln_hpux.psf
ovid - skipped
ovid/server/omf/conf/omf.properties - skipped
ovid/server/omf/modules/sdk/sdk.iml - skipped
ovid/server/omf/modules/datagen/src/com/pgp/build/data/GenJava.java - skipped
ovid/server/omf/modules/datalayer/xml/DataDef.xml - skipped
ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/PrefSetTest.java - skipped
ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/PrefDataTest.java - skipped
ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/PrefContainerTest.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/OService.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/remote/RemoteOService.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/PersistenceContext.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/PrefDataManagerImpl.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/ServiceImpl.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/PrefContainerManagerImpl.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/server/PrefSetManagerImpl.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/corba/NamingUtil.java - skipped
ovid/server/omf/modules/datalayer/build.xml - skipped
ovid/server/omf/modules/util/src/com/pgp/util/OmfProperties.java - skipped
ovid/server/omf/modules/omc/src/com/pgp/omc/AdminControllerServlet.java - skipped
ovid/server/shared/ovidserver-prefs.c - skipped
ovid/server/shared/ovidserver-db-trustedkey.c - skipped
ovid/server/shared/ovidserver-db-trustedkey.h - skipped
ovid/server/shared/ovidserver-ldap-cache.cpp - skipped
ovid/server/shared/ovidserver-db.h - skipped
ovid/server/shared/ovidserver-dictionary.cpp - skipped
ovid/server/pgpkeymaint/pgpkeymaint-keys.c - skipped
ovid/server/migration/readme-migration.txt - skipped
ovid/server/pgpupdate/pgpupdate.c - skipped
ovid/libs/proxy/proxytool/src/proxytool-main.c - skipped
ovid/client/osx/src/CPGPUDKeyGen.h - skipped
ovid/client/osx/src/CPGPUDKeyGen.m - skipped
UU libs2/pfl/win32/RainbowProgress.c
libs2/mail - skipped
libs2/mail/src/pgpMailDecrypt.c - skipped
U libs2/pgpsdk/priv/crypto/encoding/pgpDecode.c
U libs2/pgpsdk/priv/rpc/pgpRPCServer.c
U libs2/pgpsdk/priv/smime/pgpSMIMEasnDecrypt.c
U libs2/pgpsdk/priv/utilities/pgpPassCach.c
U libs2/pgpsdk/win32/PGPsdk/PGPsdk.def
U libs2/pgpsdk/win32/PGPsdkUILib/PGPsdkUI.8.0.vcproj
U libs2/pgpsdk/unix/pgp-agent/Makefile.in
U libs2/pgpsdk/unix/config/defines.mk.in
U libs2/pgpsdk/pub/include/pgpKeys.h
U libs2/pgpsdk/pub/samples/optest/optest.xcodeproj/project.pbxproj
U libs2/pgpsdk/osx/framework/PGP.framework.exp
U libs2/pgpsdk/osx/framework/PGP.framework.xcodeproj/project.pbxproj
Wed Nov 29 23:29:51 EST 2006
Syncing svn+ssh://mars.pgp.com/svn/pgpsrc
Retrieving log information from 49626 to 49643
Committed revision 49713 from revision 49626.
Committed revision 49714 from revision 49627.
Committed revision 49715 from revision 49628.
Committed revision 49716 from revision 49629.
Committed revision 49717 from revision 49630.
Committed revision 49718 from revision 49631.
Committed revision 49719 from revision 49632.
Committed revision 49720 from revision 49633.
Committed revision 49721 from revision 49634.
Committed revision 49722 from revision 49635.
Committed revision 49723 from revision 49636.
Committed revision 49724 from revision 49637.
Committed revision 49725 from revision 49638.
Committed revision 49726 from revision 49639.
Committed revision 49727 from revision 49640.
Committed revision 49728 from revision 49641.
Committed revision 49729 from revision 49642.
Committed revision 49730 from revision 49643.
Auto-merging (49710, 49730) /mirrors/pgpsrc/trunk to /local/cmdln-dev (base /mirrors/pgpsrc/trunk:49710).
U clients2/wde/bootguard/modules/pgpBGModule.c
U clients2/desktop/win32/disk/diskuipage.h
U clients2/desktop/win32/disk/diskobjects.cpp
U clients2/desktop/win32/disk/diskuipage.cpp
U clients2/clientlib/osx/Japanese.lproj/Localizable.strings
U clients2/clientlib/osx/Japanese.lproj/CEchoKeyInfo.nib/keyedobjects.nib
A misc/proxytest/Bug10843/utf8
U cmdln/build/unix/pgpcmdln_hpux.psf
U ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/OmcAdministratorTest.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenSelect.java
U ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/corba/DataTypes.java
U ovid/server/omf/modules/datalayer/bin/pgpdatalayer
U ovid/server/omf/modules/web/src/com/pgp/web/RequestContextBase.java
U ovid/libs/dyndebug/src/pgpDynamicDebugClient.c
U ovid/libs/proxy/src/pgpProxyIMAP4.c
U ovid/libs/proxy/src/pgpProxyMail.c
U ovid/client/osx/src/CPGPUDIMAPProxy.m
U ovid/client/osx/src/CPGPUDPOPProxy.m
U ovid/client/osx/src/CPGPUDSMTPProxy.m
U ovid/client/osx/src/CPGPUDOSCARProxy.m
U ovid/client/osx/src/CPGPUDKeyGen.h
U ovid/client/osx/src/CPGPUDKeyGen.m
U ovid/client/osx/src/CPGPUDDebugProxy.m
U libs2/pfl/win32/RainbowProgress.c
New merge ticket: a79679b3-9302-0410-9f41-d51457bc89fc:/trunk:49643
Committed revision 49731.
Syncing /pgp/local/cmdln-dev(/local/cmdln-dev) in /home/warlord/src/pgpsrc-cmdln-lib/src to 49731.
clients2/wde - skipped
clients2/wde/bootguard/modules/pgpBGModule.c - skipped
clients2/desktop - skipped
clients2/desktop/win32/disk/diskuipage.h - skipped
clients2/desktop/win32/disk/diskobjects.cpp - skipped
clients2/desktop/win32/disk/diskuipage.cpp - skipped
clients2/clientlib - skipped
clients2/clientlib/osx/Japanese.lproj/Localizable.strings - skipped
clients2/clientlib/osx/Japanese.lproj/CEchoKeyInfo.nib/keyedobjects.nib - skipped
misc - skipped
U cmdln/build/unix/pgpcmdln_hpux.psf
ovid - skipped
ovid/server/omf/modules/datalayer/src/test/unit/ovid/pub/OmcAdministratorTest.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/sql/GenSelect.java - skipped
ovid/server/omf/modules/datalayer/src/com/pgp/ovid/data/corba/DataTypes.java - skipped
ovid/server/omf/modules/datalayer/bin/pgpdatalayer - skipped
ovid/server/omf/modules/web/src/com/pgp/web/RequestContextBase.java - skipped
ovid/libs/dyndebug/src/pgpDynamicDebugClient.c - skipped
ovid/libs/proxy/src/pgpProxyIMAP4.c - skipped
ovid/libs/proxy/src/pgpProxyMail.c - skipped
ovid/client/osx/src/CPGPUDIMAPProxy.m - skipped
ovid/client/osx/src/CPGPUDPOPProxy.m - skipped
ovid/client/osx/src/CPGPUDSMTPProxy.m - skipped
ovid/client/osx/src/CPGPUDOSCARProxy.m - skipped
ovid/client/osx/src/CPGPUDKeyGen.h - skipped
ovid/client/osx/src/CPGPUDKeyGen.m - skipped
ovid/client/osx/src/CPGPUDDebugProxy.m - skipped
U libs2/pfl/win32/RainbowProgress.c
Auto-merging (49593, 49732) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49730).
===> Auto-merging (49593, 49601) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49600).
Merging back to mirror source svn+ssh://mars.pgp.com/svn/pgpsrc.
Empty merge.
===> Auto-merging (49601, 49666) /local/cmdln-dev to /mirrors/pgpsrc/trunk (base /mirrors/pgpsrc/trunk:49662).
Merging back to mirror source svn+ssh://mars.pgp.com/svn/pgpsrc.
A libs2/messaging/pub/pgpMsgPrivate.h
New merge ticket: 4b02fed6-1982-4324-8d42-994ac65bc45c:/local/cmdln-dev:49666
A repository hook failed: 'pre-commit' hook failed with error output:
You must enter a log message!
--
Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
Member, MIT Student Information Processing Board (SIPB)
URL: http://web.mit.edu/warlord/ PP-ASEL-IA N1NWH
warlord at MIT.EDU PGP key available
More information about the svk-devel
mailing list