monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision a8cd7f6dc73c51dbcdb5a26591adc8c27cb5d7


From: monotone
Subject: [Monotone-commits-diffs] Revision a8cd7f6dc73c51dbcdb5a26591adc8c27cb5d74d
Date: Sat, 17 May 2008 21:42:58 +0200

-----------------------------------------------------------------
Revision: a8cd7f6dc73c51dbcdb5a26591adc8c27cb5d74d
Ancestor: 30f75f528dcc712fc1f3a0db07eb7d680618465c
Ancestor: f9b7dd17dd42fe3e06af4643b18f14e50335076c
Author: address@hidden
Date: 2008-05-03T06:32:23
Branch: net.venge.monotone.guitone.app-driver

Deleted entries:
        src/util/SignalWaiter.cpp src/util/SignalWaiter.h
Renamed entries:
        res/forms/workspace_floater.ui to res/forms/icon_help.ui
        src/Guitone.cpp to src/GuitoneStandalone.cpp
        src/Guitone.h to src/GuitoneStandalone.h
        src/view/WorkspaceFloater.cpp to src/view/panels/IconHelp.cpp
        src/view/WorkspaceFloater.h to src/view/panels/IconHelp.h
Added files:
        res/forms/add_edit_variables.ui res/forms/db_variables.ui
        res/win32/guitone.bmp res/win32/guitone.iss
        res/win32/monotone_db.ico res/win32/website.url
        src/GuitoneCore.cpp src/GuitoneCore.h src/GuitoneDriver.cpp
        src/GuitoneDriver.h src/model/GetDatabaseVariables.cpp
        src/model/GetDatabaseVariables.h src/model/Graph.cpp
        src/model/Graph.h
        src/view/dialogs/AddEditDatabaseVariable.cpp
        src/view/dialogs/AddEditDatabaseVariable.h
        src/view/panels/DatabaseVariables.cpp
        src/view/panels/DatabaseVariables.h
        tests/tst_BasicIOParser.h
Added directories:
        src/view/panels
Modified files:
        COPYING NEWS README guitone.pro notes/IDEAS
        notes/RELEASE_CHECKLIST notes/TODO osx_bundle.sh
        res/forms/about.ui res/forms/add_edit_attribute.ui
        res/forms/application_update.ui
        res/forms/changeset_browser.ui res/forms/commit_revision.ui
        res/forms/icon_help.ui res/forms/open_prompt.ui
        res/forms/preferences.ui res/i18n/guitone_de.ts
        res/osx/Info.plist.in res/win32/guitone.rc
        src/GuitoneStandalone.cpp src/GuitoneStandalone.h
        src/main.cpp src/model/Ancestors.cpp src/model/Ancestors.h
        src/model/AutomateCommand.cpp src/model/AutomateCommand.h
        src/model/Branches.cpp src/model/Branches.h
        src/model/Certs.cpp src/model/Certs.h
        src/model/ChangesetModel.cpp src/model/ChangesetModel.h
        src/model/ContentDiff.cpp src/model/ContentDiff.h
        src/model/GetAttributes.cpp src/model/GetAttributes.h
        src/model/GetBranchLog.cpp src/model/GetBranchLog.h
        src/model/GetContentChanged.cpp
        src/model/GetContentChanged.h src/model/GetFile.cpp
        src/model/GetFile.h src/model/GetFileProxyModel.cpp
        src/model/GetFileProxyModel.h src/model/GetRevision.cpp
        src/model/GetRevision.h src/model/Inventory.cpp
        src/model/Inventory.h src/model/InventoryItem.cpp
        src/model/InventoryItem.h src/model/InventoryProxyModel.cpp
        src/model/InventoryProxyModel.h src/model/Keys.cpp
        src/model/Keys.h src/model/Manifest.cpp src/model/Manifest.h
        src/model/Select.cpp src/model/Select.h src/model/Tags.cpp
        src/model/Tags.h src/model/Toposort.cpp src/model/Toposort.h
        src/monotone/FileExporter.cpp src/monotone/FileExporter.h
        src/monotone/MonotoneManager.cpp
        src/monotone/MonotoneManager.h
        src/monotone/MonotoneThread.cpp
        src/monotone/MonotoneThread.h src/monotone/MonotoneUtil.cpp
        src/monotone/MonotoneUtil.h
        src/monotone/WorkspaceCommitter.cpp
        src/monotone/WorkspaceCommitter.h
        src/monotone/WorkspaceCreator.cpp
        src/monotone/WorkspaceCreator.h src/util/AbstractParser.cpp
        src/util/AbstractParser.h src/util/BasicIOParser.cpp
        src/util/BasicIOParser.h src/util/BasicIOWriter.cpp
        src/util/BasicIOWriter.h src/util/DebugLog.cpp
        src/util/DebugLog.h src/util/DiffParser.cpp
        src/util/DiffParser.h src/util/IconProvider.cpp
        src/util/IconProvider.h src/util/Platform.cpp
        src/util/Platform.h src/util/Settings.cpp
        src/util/Settings.h src/util/StdioParser.cpp
        src/util/StdioParser.h src/util/TreeBuilder.cpp
        src/util/TreeBuilder.h src/view/AttributesView.cpp
        src/view/AttributesView.h src/view/DatabaseMenuBar.cpp
        src/view/DatabaseMenuBar.h src/view/DatabaseWindow.cpp
        src/view/DatabaseWindow.h src/view/DiffStatusView.cpp
        src/view/DiffStatusView.h src/view/InventoryView.cpp
        src/view/InventoryView.h src/view/InventoryViewDelegate.cpp
        src/view/InventoryViewDelegate.h src/view/MainWindow.cpp
        src/view/MainWindow.h src/view/MenuBar.cpp
        src/view/MenuBar.h src/view/Splitter.cpp src/view/Splitter.h
        src/view/TreeView.cpp src/view/TreeView.h
        src/view/WorkspaceMenuBar.cpp src/view/WorkspaceMenuBar.h
        src/view/WorkspaceWindow.cpp src/view/WorkspaceWindow.h
        src/view/dialogs/About.cpp src/view/dialogs/About.h
        src/view/dialogs/AddEditAttribute.cpp
        src/view/dialogs/AddEditAttribute.h
        src/view/dialogs/ApplicationUpdate.cpp
        src/view/dialogs/ApplicationUpdate.h
        src/view/dialogs/ChangesetBrowser.cpp
        src/view/dialogs/ChangesetBrowser.h
        src/view/dialogs/CheckoutRevision.cpp
        src/view/dialogs/CheckoutRevision.h
        src/view/dialogs/CommitRevision.cpp
        src/view/dialogs/CommitRevision.h
        src/view/dialogs/DatabaseDialogManager.cpp
        src/view/dialogs/DatabaseDialogManager.h
        src/view/dialogs/Dialog.cpp src/view/dialogs/Dialog.h
        src/view/dialogs/DialogManager.cpp
        src/view/dialogs/DialogManager.h
        src/view/dialogs/FileDiff.cpp src/view/dialogs/FileDiff.h
        src/view/dialogs/FileHistory.cpp
        src/view/dialogs/FileHistory.h
        src/view/dialogs/GenerateKeypair.cpp
        src/view/dialogs/GenerateKeypair.h
        src/view/dialogs/KeyManagement.cpp
        src/view/dialogs/KeyManagement.h
        src/view/dialogs/OpenPrompt.cpp
        src/view/dialogs/OpenPrompt.h
        src/view/dialogs/Preferences.cpp
        src/view/dialogs/Preferences.h
        src/view/dialogs/RevisionDiff.cpp
        src/view/dialogs/RevisionDiff.h
        src/view/dialogs/RevisionManifest.cpp
        src/view/dialogs/RevisionManifest.h
        src/view/dialogs/SelectRevision.cpp
        src/view/dialogs/SelectRevision.h
        src/view/dialogs/UnaccountedRenames.cpp
        src/view/dialogs/UnaccountedRenames.h
        src/view/dialogs/UpdateWorkspace.cpp
        src/view/dialogs/UpdateWorkspace.h
        src/view/dialogs/WorkspaceDialogManager.cpp
        src/view/dialogs/WorkspaceDialogManager.h
        src/view/panels/IconHelp.cpp src/view/panels/IconHelp.h
        src/vocab.h tests/test.cpp tests/test.pro
        tests/tst_StdioParser.h
Modified attrs:
        res/win32/guitone.bmp

ChangeLog: 

explicit merge of '30f75f528dcc712fc1f3a0db07eb7d680618465c'
              and 'f9b7dd17dd42fe3e06af4643b18f14e50335076c'


monotone --db={your.database} diff 
--revision=30f75f528dcc712fc1f3a0db07eb7d680618465c 
--revision=a8cd7f6dc73c51dbcdb5a26591adc8c27cb5d74d
monotone --db={your.database} diff 
--revision=f9b7dd17dd42fe3e06af4643b18f14e50335076c 
--revision=a8cd7f6dc73c51dbcdb5a26591adc8c27cb5d74d
----------------------------------------------------------------------




reply via email to

[Prev in Thread] Current Thread [Next in Thread]