[Monotone-commits-diffs] Revision 7e534197bf34ccf3e8e8de6764e505aaa730d4c6

[monotone]

-----------------------------------------------------------------
Revision: 7e534197bf34ccf3e8e8de6764e505aaa730d4c6
Ancestor: 753c501c7d9036900b4d57fc4620bb1c5de28382
Ancestor: 9822e256e45cbb80aefcfdc2ab3dbb3b6dbcfd68
Author: address@hidden
Date: 2008-05-02T17:47:00
Branch: net.venge.monotone.web.ikiwiki

Deleted entries:
        wiki/DaggyFixes.moin wiki/MtnSummit/2008/Branches.mdwn
        wiki/ZipperMerge.moin
Renamed entries:
        wiki/AttrUseCases.moin to wiki/AttrUseCases.mdwn
        wiki/AutoInodeprints.moin to wiki/AutoInodeprints.mdwn
        wiki/AutomateMagic.moin to wiki/AutomateMagic.mdwn
        wiki/AutomateVersions.moin to wiki/AutomateVersions.mdwn
        wiki/AutomateWishlist.moin to wiki/AutomateWishlist.mdwn
        wiki/BasicIoFormalization.moin to wiki/BasicIoFormalization.mdwn
        wiki/BestPractices.moin to wiki/BestPractices.mdwn
        wiki/BranchAnalogy.moin to wiki/BranchAnalogy.mdwn
        wiki/BranchNamingConventions.moin to wiki/BranchNamingConventions.mdwn
        wiki/BranchRenaming.moin to wiki/BranchRenaming.mdwn
        wiki/BranchStatuses.moin to wiki/BranchStatuses.mdwn
        wiki/BranchUI.moin to wiki/BranchUI.mdwn
        wiki/BugSquashingParty.moin to wiki/BugSquashingParty.mdwn
        wiki/BuildBot.moin to wiki/BuildBot.mdwn
        wiki/BuildingOnMac.moin to wiki/BuildingOnMac.mdwn
        wiki/BuildingOnSolaris.moin to wiki/BuildingOnSolaris.mdwn
        wiki/BuildingOnWindows/VC8.moin to wiki/BuildingOnWindows/VC8.mdwn
        wiki/BuildingOnWindows/VisualC8.moin to 
wiki/BuildingOnWindows/VisualC8.mdwn
        wiki/BuildingViaPkgsrc.moin to wiki/BuildingViaPkgsrc.mdwn
        wiki/CarrotAndStick.moin to wiki/CarrotAndStick.mdwn
        wiki/CaseInsensitiveFilesystems.moin to 
wiki/CaseInsensitiveFilesystems.mdwn
        wiki/CertCleanup.moin to wiki/CertCleanup.mdwn
        wiki/ChadWalstrom.moin to wiki/ChadWalstrom.mdwn
        wiki/ChangeLog.moin to wiki/ChangeLog.mdwn
        wiki/CherryPicking.moin to wiki/CherryPicking.mdwn
        wiki/ChristofPetig.moin to wiki/ChristofPetig.mdwn
        wiki/CraigLennox.moin to wiki/CraigLennox.mdwn
        wiki/CreatingBranches.moin to wiki/CreatingBranches.mdwn
        wiki/CvsImport.moin to wiki/CvsImport.mdwn
        wiki/CvsSync.moin to wiki/CvsSync.mdwn
        wiki/CvsSync3.moin to wiki/CvsSync3.mdwn
        wiki/DagBasedRefinement.moin to wiki/DagBasedRefinement.mdwn
        wiki/DatabaseLocking.moin to wiki/DatabaseLocking.mdwn
        wiki/DeltaStorageStrategies/ShootOut.moin to 
wiki/DeltaStorageStrategies/ShootOut.mdwn
        wiki/DeltaStorageStrategies.moin to wiki/DeltaStorageStrategies.mdwn
        wiki/DerekScherger.moin to wiki/DerekScherger.mdwn
        wiki/DevGroup.moin to wiki/DevGroup.mdwn
        wiki/EmileSnyder.moin to wiki/EmileSnyder.mdwn
        wiki/EssentialMonotone.moin to wiki/EssentialMonotone.mdwn
        wiki/Feature/AccessControl.moin to wiki/Feature/AccessControl.mdwn
        wiki/Feature/AtomicCommit.moin to wiki/Feature/AtomicCommit.mdwn
        wiki/Feature/BuildIntegration.moin to wiki/Feature/BuildIntegration.mdwn
        wiki/Feature/CVSExport.moin to wiki/Feature/CVSExport.mdwn
        wiki/Feature/CVSImport.moin to wiki/Feature/CVSImport.mdwn
        wiki/Feature/CommitMail.moin to wiki/Feature/CommitMail.mdwn
        wiki/Feature/CompactRepository.moin to 
wiki/Feature/CompactRepository.mdwn
        wiki/Feature/EmbeddedIDs.moin to wiki/Feature/EmbeddedIDs.mdwn
        wiki/Feature/Fast.moin to wiki/Feature/Fast.mdwn
        wiki/Feature/LightweightBranches.moin to 
wiki/Feature/LightweightBranches.mdwn
        wiki/Feature/LogReview.moin to wiki/Feature/LogReview.mdwn
        wiki/Feature/LogTemplates.moin to wiki/Feature/LogTemplates.mdwn
        wiki/Feature/MIMEtypes.moin to wiki/Feature/MIMEtypes.mdwn
        wiki/Feature/Merging.moin to wiki/Feature/Merging.mdwn
        wiki/Feature/Mirroring.moin to wiki/Feature/Mirroring.mdwn
        wiki/Feature/NetworkSecurity.moin to wiki/Feature/NetworkSecurity.mdwn
        wiki/Feature/Obliterate.moin to wiki/Feature/Obliterate.mdwn
        wiki/Feature/Offline.moin to wiki/Feature/Offline.mdwn
        wiki/Feature/Portable.moin to wiki/Feature/Portable.mdwn
        wiki/Feature/Rename.moin to wiki/Feature/Rename.mdwn
        wiki/Feature/RobustRepository.moin to wiki/Feature/RobustRepository.mdwn
        wiki/Feature/SignedRevisions.moin to wiki/Feature/SignedRevisions.mdwn
        wiki/Feature/Symlinks.moin to wiki/Feature/Symlinks.mdwn
        wiki/Feature/VendorBranches.moin to wiki/Feature/VendorBranches.mdwn
        wiki/Feature/WebInterface.moin to wiki/Feature/WebInterface.mdwn
        wiki/FileSystemIssues.moin to wiki/FileSystemIssues.mdwn
        wiki/ForSide.moin to wiki/ForSide.mdwn
        wiki/FutureCryptography.moin to wiki/FutureCryptography.mdwn
        wiki/Glossary.moin to wiki/Glossary.mdwn
        wiki/HistoryBlueSky.moin to wiki/HistoryBlueSky.mdwn
        wiki/Hosting.moin to wiki/Hosting.mdwn
        wiki/HugoMills.moin to wiki/HugoMills.mdwn
        wiki/I18nL10n.moin to wiki/I18nL10n.mdwn
        wiki/IPv6.moin to wiki/IPv6.mdwn
        wiki/JackLloyd.moin to wiki/JackLloyd.mdwn
        wiki/JustinPatrin.moin to wiki/JustinPatrin.mdwn
        wiki/KeystoreFiles.moin to wiki/KeystoreFiles.mdwn
        wiki/LineEndingMunging.moin to wiki/LineEndingMunging.mdwn
        wiki/LocalBadContent.moin to wiki/LocalBadContent.mdwn
        wiki/LocalSpellingWords.moin to wiki/LocalSpellingWords.mdwn
        wiki/LogUI.moin to wiki/LogUI.mdwn
        wiki/MagicSelectors.moin to wiki/MagicSelectors.mdwn
        wiki/MarcelvanderBoom.moin to wiki/MarcelvanderBoom.mdwn
        wiki/MarkusSchiltknecht.moin to wiki/MarkusSchiltknecht.mdwn
        wiki/MattJohnston.moin to wiki/MattJohnston.mdwn
        wiki/MergeViaWorkingDir.moin to wiki/MergeViaWorkingDir.mdwn
        wiki/MonotoneAndCVS.moin to wiki/MonotoneAndCVS.mdwn
        wiki/MonotoneOnDebian.moin to wiki/MonotoneOnDebian.mdwn
        wiki/MtnSummit/2007/AsciikReview.moin to 
wiki/MtnSummit/2007/AsciikReview.mdwn
        wiki/MtnSummit/2007/Funding.moin to wiki/MtnSummit/2007/Funding.mdwn
        wiki/MtnSummit/2007/Gibberish.moin to wiki/MtnSummit/2007/Gibberish.mdwn
        wiki/MtnSummit/2007/Ideas.moin to wiki/MtnSummit/2007/Ideas.mdwn
        wiki/MtnSummit/2007/InterestAndDates.moin to 
wiki/MtnSummit/2007/InterestAndDates.mdwn
        wiki/MtnSummit/2007/LogisticsNA.moin to 
wiki/MtnSummit/2007/LogisticsNA.mdwn
        wiki/MtnSummit/2007/Notes.moin to wiki/MtnSummit/2007/Notes.mdwn
        wiki/MtnSummit/2007/Rooms.moin to wiki/MtnSummit/2007/Rooms.mdwn
        wiki/MtnSummit/2007/Schedule.moin to wiki/MtnSummit/2007/Schedule.mdwn
        wiki/MtnSummit/2007.moin to wiki/MtnSummit/2007.mdwn
        wiki/MtnSummit/2008 to branches
        wiki/MtnSummitWishes.moin to wiki/MtnSummitWishes.mdwn
        wiki/MultiParentWorkspaceFallout.moin to 
wiki/MultiParentWorkspaceFallout.mdwn
        wiki/NonMergeConflicts.moin to wiki/NonMergeConflicts.mdwn
        wiki/NotesOnTestingChangesetify.moin to 
wiki/NotesOnTestingChangesetify.mdwn
        wiki/OldTestHarnessIssues.moin to wiki/OldTestHarnessIssues.mdwn
        wiki/OneBranchPerDbForServe.moin to wiki/OneBranchPerDbForServe.mdwn
        wiki/PartialPull.moin to wiki/PartialPull.mdwn
        wiki/PaulCrowley.moin to wiki/PaulCrowley.mdwn
        wiki/People.moin to wiki/People.mdwn
        wiki/PerformanceWork/SQLiteAnalyzeDiscussion.moin to 
wiki/PerformanceWork/SQLiteAnalyzeDiscussion.mdwn
        wiki/PerformanceWork.moin to wiki/PerformanceWork.mdwn
        wiki/PieceCache.moin to wiki/PieceCache.mdwn
        wiki/ProjectsUsingMonotone.moin to wiki/ProjectsUsingMonotone.mdwn
        wiki/QuickieTasks.moin to wiki/QuickieTasks.mdwn
        wiki/RelativePathnames.moin to wiki/RelativePathnames.mdwn
        wiki/ReleaseBranchPattern.moin to wiki/ReleaseBranchPattern.mdwn
        wiki/RevertUI.moin to wiki/RevertUI.mdwn
        wiki/RevisionNumbering.moin to wiki/RevisionNumbering.mdwn
        wiki/RichardLevitte.moin to wiki/RichardLevitte.mdwn
        wiki/RosterifyingPrivateBranches.moin to 
wiki/RosterifyingPrivateBranches.mdwn
        wiki/RostersTodo/MarkAndMergeTests.moin to 
wiki/RostersTodo/MarkAndMergeTests.mdwn
        wiki/RostersTodo.moin to wiki/RostersTodo.mdwn
        wiki/RunDbCheckOften.moin to wiki/RunDbCheckOften.mdwn
        wiki/SelfHostingInfo.moin to wiki/SelfHostingInfo.mdwn
        wiki/SimplerIgnoreMechanism.moin to wiki/SimplerIgnoreMechanism.mdwn
        wiki/SummerOfCode2006.moin to wiki/SummerOfCode2006.mdwn
        wiki/SummerOfCode2007/Ideas.moin to wiki/SummerOfCode2007/Ideas.mdwn
        wiki/SurveyQuestions.moin to wiki/SurveyQuestions.mdwn
        wiki/SymLinks.moin to wiki/SymLinks.mdwn
        wiki/TestHarnessIssues/CleanUpTestNames.moin to 
wiki/TestHarnessIssues/CleanUpTestNames.mdwn
        wiki/TestHarnessIssues.moin to wiki/TestHarnessIssues.mdwn
        wiki/TestIntro.moin to wiki/TestIntro.mdwn
        wiki/Testimonials.moin to wiki/Testimonials.mdwn
        wiki/ThomasKeller.moin to wiki/ThomasKeller.mdwn
        wiki/TimeStamps.moin to wiki/TimeStamps.mdwn
        wiki/TroubleShooting.moin to wiki/TroubleShooting.mdwn
        wiki/TrustDiscussion.moin to wiki/TrustDiscussion.mdwn
        wiki/TrustFoundations.moin to wiki/TrustFoundations.mdwn
        wiki/User:Metaeducation.moin to wiki/User:Metaeducation.mdwn
        wiki/UsingCerts.moin to wiki/UsingCerts.mdwn
        wiki/VendorBranchPattern.moin to wiki/VendorBranchPattern.mdwn
        wiki/VersionedPolicy/Archive.moin to wiki/VersionedPolicy/Archive.mdwn
        wiki/VersionedPolicy/Comparison.moin to 
wiki/VersionedPolicy/Comparison.mdwn
        wiki/VersionedPolicy/Graydon.moin to wiki/VersionedPolicy/Graydon.mdwn
        wiki/VersionedPolicy/Interface.moin to 
wiki/VersionedPolicy/Interface.mdwn
        wiki/VersionedPolicy/SPKIWontWork.moin to 
wiki/VersionedPolicy/SPKIWontWork.mdwn
        wiki/VersionedPolicy/WorkList.moin to wiki/VersionedPolicy/WorkList.mdwn
        wiki/VersionedPolicy.moin to wiki/VersionedPolicy.mdwn
        wiki/Win32DeviceFiles.moin to wiki/Win32DeviceFiles.mdwn
        wiki/WorkspaceConflicts.moin to wiki/WorkspaceConflicts.mdwn
        wiki/ZeroConf.moin to wiki/ZeroConf.mdwn
        wiki/elb.moin to wiki/elb.mdwn
        wiki/gwk.moin to wiki/gwk.mdwn
Added files:
        branches/nvm.automate-netsync.mdwn
        branches/nvm.automate_out_of_band.mdwn
        branches/nvm.commit_without_-b.mdwn
        branches/nvm.lapo.selectors.mdwn
        branches/nvm.web.ikiwiki.mdwn
Modified files:
        wiki/AttrUseCases.mdwn wiki/AutoInodeprints.mdwn
        wiki/AutomateMagic.mdwn wiki/AutomateVersions.mdwn
        wiki/AutomateWishlist.mdwn wiki/BasicIoFormalization.mdwn
        wiki/BestPractices.mdwn wiki/BranchAnalogy.mdwn
        wiki/BranchNamingConventions.mdwn wiki/BranchRenaming.mdwn
        wiki/BranchStatuses.mdwn wiki/BranchUI.mdwn
        wiki/BugSquashingParty.mdwn wiki/BuildBot.mdwn
        wiki/BuildingOnMac.mdwn wiki/BuildingOnSolaris.mdwn
        wiki/BuildingOnWindows/VC8.mdwn
        wiki/BuildingOnWindows/VisualC8.mdwn
        wiki/BuildingViaPkgsrc.mdwn wiki/CarrotAndStick.mdwn
        wiki/CaseInsensitiveFilesystems.mdwn wiki/CertCleanup.mdwn
        wiki/ChadWalstrom.mdwn wiki/ChangeLog.mdwn
        wiki/CherryPicking.mdwn wiki/ChristofPetig.mdwn
        wiki/CraigLennox.mdwn wiki/CreatingBranches.mdwn
        wiki/CvsImport.mdwn wiki/CvsSync.mdwn wiki/CvsSync3.mdwn
        wiki/DagBasedRefinement.mdwn wiki/DaggyFixes.mdwn
        wiki/DatabaseLocking.mdwn
        wiki/DeltaStorageStrategies/ShootOut.mdwn
        wiki/DeltaStorageStrategies.mdwn wiki/DerekScherger.mdwn
        wiki/DevGroup.mdwn wiki/EmileSnyder.mdwn
        wiki/EssentialMonotone.mdwn wiki/Feature/AccessControl.mdwn
        wiki/Feature/AtomicCommit.mdwn
        wiki/Feature/BuildIntegration.mdwn
        wiki/Feature/CVSExport.mdwn wiki/Feature/CVSImport.mdwn
        wiki/Feature/CommitMail.mdwn
        wiki/Feature/CompactRepository.mdwn
        wiki/Feature/EmbeddedIDs.mdwn wiki/Feature/Fast.mdwn
        wiki/Feature/LightweightBranches.mdwn
        wiki/Feature/LogReview.mdwn wiki/Feature/LogTemplates.mdwn
        wiki/Feature/MIMEtypes.mdwn wiki/Feature/Merging.mdwn
        wiki/Feature/Mirroring.mdwn
        wiki/Feature/NetworkSecurity.mdwn
        wiki/Feature/Obliterate.mdwn wiki/Feature/Offline.mdwn
        wiki/Feature/Portable.mdwn wiki/Feature/Rename.mdwn
        wiki/Feature/RobustRepository.mdwn
        wiki/Feature/SignedRevisions.mdwn wiki/Feature/Symlinks.mdwn
        wiki/Feature/Template.mdwn wiki/Feature/VendorBranches.mdwn
        wiki/Feature/WebInterface.mdwn wiki/FileSystemIssues.mdwn
        wiki/ForSide.mdwn wiki/FutureCryptography.mdwn
        wiki/Glossary.mdwn wiki/HistoryBlueSky.mdwn
        wiki/Hosting.mdwn wiki/HugoMills.mdwn wiki/I18nL10n.mdwn
        wiki/IPv6.mdwn wiki/InterfacesFrontendsAndTools.mdwn
        wiki/JackLloyd.mdwn wiki/JustinPatrin.mdwn
        wiki/KeystoreFiles.mdwn wiki/LineEndingMunging.mdwn
        wiki/LocalBadContent.mdwn wiki/LocalSpellingWords.mdwn
        wiki/LogUI.mdwn wiki/MagicSelectors.mdwn
        wiki/MarcelvanderBoom.mdwn wiki/MarkusSchiltknecht.mdwn
        wiki/MattJohnston.mdwn wiki/MergeViaWorkingDir.mdwn
        wiki/MonotoneAndCVS.mdwn wiki/MonotoneOnDebian.mdwn
        wiki/MtnSummit/2007/AsciikReview.mdwn
        wiki/MtnSummit/2007/Funding.mdwn
        wiki/MtnSummit/2007/Gibberish.mdwn
        wiki/MtnSummit/2007/Ideas.mdwn
        wiki/MtnSummit/2007/InterestAndDates.mdwn
        wiki/MtnSummit/2007/LogisticsNA.mdwn
        wiki/MtnSummit/2007/Notes.mdwn
        wiki/MtnSummit/2007/Rooms.mdwn
        wiki/MtnSummit/2007/Schedule.mdwn wiki/MtnSummit/2007.mdwn
        wiki/MtnSummit/2008.mdwn wiki/MtnSummitWishes.mdwn
        wiki/MultiParentWorkspaceFallout.mdwn
        wiki/NonMergeConflicts.mdwn
        wiki/NotesOnTestingChangesetify.mdwn
        wiki/OldTestHarnessIssues.mdwn
        wiki/OneBranchPerDbForServe.mdwn wiki/PartialPull.mdwn
        wiki/PaulCrowley.mdwn wiki/People.mdwn
        wiki/PerformanceWork/SQLiteAnalyzeDiscussion.mdwn
        wiki/PerformanceWork.mdwn wiki/PieceCache.mdwn
        wiki/ProjectsUsingMonotone.mdwn wiki/QuickieTasks.mdwn
        wiki/RelativePathnames.mdwn wiki/ReleaseBranchPattern.mdwn
        wiki/RevertUI.mdwn wiki/RevisionNumbering.mdwn
        wiki/RichardLevitte.mdwn
        wiki/RosterifyingPrivateBranches.mdwn
        wiki/RostersTodo/MarkAndMergeTests.mdwn
        wiki/RostersTodo.mdwn wiki/RunDbCheckOften.mdwn
        wiki/SelfHostingInfo.mdwn wiki/SimplerIgnoreMechanism.mdwn
        wiki/SummerOfCode2006.mdwn wiki/SummerOfCode2007/Ideas.mdwn
        wiki/SurveyQuestions.mdwn wiki/SymLinks.mdwn
        wiki/TestHarnessIssues/CleanUpTestNames.mdwn
        wiki/TestHarnessIssues.mdwn wiki/TestIntro.mdwn
        wiki/Testimonials.mdwn wiki/ThomasKeller.mdwn
        wiki/TimeStamps.mdwn wiki/TroubleShooting.mdwn
        wiki/TrustDiscussion.mdwn wiki/TrustFoundations.mdwn
        wiki/User:Metaeducation.mdwn wiki/UsingCerts.mdwn
        wiki/VendorBranchPattern.mdwn
        wiki/VersionedPolicy/Archive.mdwn
        wiki/VersionedPolicy/Comparison.mdwn
        wiki/VersionedPolicy/Graydon.mdwn
        wiki/VersionedPolicy/Interface.mdwn
        wiki/VersionedPolicy/SPKIWontWork.mdwn
        wiki/VersionedPolicy/WorkList.mdwn wiki/VersionedPolicy.mdwn
        wiki/Win32DeviceFiles.mdwn wiki/WorkspaceConflicts.mdwn
        wiki/ZeroConf.mdwn wiki/elb.mdwn wiki/gwk.mdwn
        wiki/ikiwikimigration.mdwn wiki/moin2mdwn.sed wiki.mdwn

ChangeLog: 

merge of '753c501c7d9036900b4d57fc4620bb1c5de28382'
     and '9822e256e45cbb80aefcfdc2ab3dbb3b6dbcfd68'


monotone --db={your.database} diff 
--revision=753c501c7d9036900b4d57fc4620bb1c5de28382 
--revision=7e534197bf34ccf3e8e8de6764e505aaa730d4c6
monotone --db={your.database} diff 
--revision=9822e256e45cbb80aefcfdc2ab3dbb3b6dbcfd68 
--revision=7e534197bf34ccf3e8e8de6764e505aaa730d4c6
----------------------------------------------------------------------