On Fri, Jan 30, 2009 at 8:20 AM, Adriano Marques <[email protected]> wrote: > Hello Guilherme, > >> I just completed the merge locally, just need to solve property conflicts >> now. > > Great news! Thanks for the help and the effort. > >> Is it fine to commit it ? There is a ticket open for it, but it is >> better if everyone is aware of this since it will affect a lot of >> files. > > I think it is ok. It is going to be a great change, will affect a lot > of files but we better commit it and latter deal with the changes. Do > you know what are the affected parts already?
It includes more new additions than modifications, here is the full svn status: M umitGUI/SearchWindow.py M umitGUI/Wizard.py M umitGUI/App.py A + umitGUI/SchedulerEdit.py M umitGUI/OptionCombo.py A + umitGUI/SMTPSetup.py M umitGUI/ProfileEditor.py A + umitGUI/GenericAlertDialogs.py M umitGUI/Icons.py M umitGUI/MainWindow.py M umitGUI/OptionBuilder.py A + umitGUI/SchedulerControl.py M umitGUI/ScanNotebook.py A + umitDB A + umitDB/sql A + umitDB/sql/sqlite-delete-triggers.sql A + umitDB/sql/sqlite-update-triggers.sql A + umitDB/sql/sqlite-drop-triggers.sql A + umitDB/sql/sqlite-insert-triggers.sql A + umitDB/sql/sqlite-drop-tables.sql A + umitDB/sql/sqlite-schema.sql A + umitDB/setup A + umitDB/setup/_sqlite.py A + umitDB/setup/_database.py A + umitDB/setup/database_setup.py A + umitDB/setup/README A + umitDB/Store.py A + umitDB/Remove.py A + umitDB/XMLStore.py A + umitDB/Connection.py A + umitDB/__init__.py A + umitDB/Utils.py A + umitDB/_sqlite.py A + umitDB/_database.py A + umitDB/Retrieve.py A + umitDB/Search.py A + umitDB/InventoryChanges.py A + CHANGES.features M umitCore A + umitCore/Utils.py M umitCore/BasePaths.py A + umitCore/Scheduler.py A + umitCore/CronParser.py M umitCore/UmitOptionParser.py M umitCore/UmitLogging.py M umitCore/NmapCommand.py M umitCore/Paths.py A + umitCore/DataDecay.py M umitCore/UmitConf.py A + umit-scheduler A + umitInventory A + umitInventory/TLChangesTree.py A + umitInventory/SearchBar.py A + umitInventory/TLBarDisplay.py A + umitInventory/TLConnector.py A + umitInventory/InventoryLoad.py A + umitInventory/DataGrabber.py A + umitInventory/DataRemoval.py A + umitInventory/__init__.py A + umitInventory/ChangesDiff.py A + umitInventory/TLGraph.py A + umitInventory/Viewer.py A + umitInventory/TLToolbar.py A + umitInventory/ChangesList.py A + umitInventory/HostDiscovery.py A + umitInventory/Timeline.py A + umitInventory/NewInventory.py A + umitInventory/Calendar.py A + umitInventory/About.py A + umitInventory/TLBase.py A + umitInventory/InventoryTree.py A + umitInventory/SettingsWin.py A + umitInventory/RefreshDialog.py A + umitInventory/SchedulerLog.py A + umitInventory/StartupSettings.py A + umitInventory/TLGraphPreferences.py A + umitInventory/TLGraphToolbar.py A + umitInventory/ColoredToggleButton.py M higwidgets/higlabels.py M higwidgets/__init__.py M higwidgets/higframe.py A + share/pixmaps/root_inventory.png A + share/doc/umit/scheduler.html M share/doc/umit/help.html A + share/doc/umit/nisearch A + share/doc/umit/nisearch/nisearch.xml A + share/doc/umit/nisearch.html A + share/doc/umit/smtpsetup A + share/doc/umit/smtpsetup/smtpsetup.xml A + share/doc/umit/smtpsetup.html A + share/doc/umit/nigraphs A + share/doc/umit/nigraphs/nigraphs.xml M share/doc/umit/Makefile A + share/doc/umit/scheduler A + share/doc/umit/scheduler/scheduler.xml A + share/doc/umit/nigraphs.html A + share/umit/config/scheduler-profiles.conf A + share/umit/config/scheduler-schemas.conf A + share/umit/config/umitng.db A + share/umit/config/smtp-schemas.conf A + share/umit/config/timeline-settings.conf A + share/umit/config/scheduler.log M share/umit/config/umit.conf A + share/umit/config/tl_colors_evt_std.conf M install_scripts/unix/setup.py M umit > > Cheers! > > -- > Adriano Monteiro Marques > > http://adriano-marques.blogspot.com > http://www.umitproject.org > http://www.pythonbenelux.org > > "Don't stay in bed, unless you can make money in bed." - George Burns > -- -- Guilherme H. Polo Goncalves ------------------------------------------------------------------------------ This SF.net email is sponsored by: SourcForge Community SourceForge wants to tell your story. http://p.sf.net/sfu/sf-spreadtheword _______________________________________________ Umit-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/umit-devel
