[Monotone-commits-diffs] Revision f107f450725ca7c0f2855318372c245abc659c10

[monotone]

-----------------------------------------------------------------
Revision: f107f450725ca7c0f2855318372c245abc659c10
Ancestor: 39a70e62ebad8bfcfa6eb4f7eabd36fd31a28d14
Ancestor: ab31875d725e70e5376067ef9e9a67e1f21cf8ec
Author: Matt Johnston <address@hidden>
Date: 2007-05-11T09:00:24
Branch: net.venge.monotone

Renamed entries:
        tests/automate_attributes to tests/automate_get_attributes
Added files:
        tests/automate_set_drop_attribute/__driver__.lua
Added directories:
        tests/automate_set_drop_attribute
Modified files:
        automate.cc cmd_automate.cc cmd_ws_commit.cc database.cc
        monotone.texi po/sv.po
        tests/automate_get_attributes/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua

ChangeLog: 

merge of '39a70e62ebad8bfcfa6eb4f7eabd36fd31a28d14'
     and 'ab31875d725e70e5376067ef9e9a67e1f21cf8ec'


monotone --db={your.database} diff 
--revision=39a70e62ebad8bfcfa6eb4f7eabd36fd31a28d14 
--revision=f107f450725ca7c0f2855318372c245abc659c10
monotone --db={your.database} diff 
--revision=ab31875d725e70e5376067ef9e9a67e1f21cf8ec 
--revision=f107f450725ca7c0f2855318372c245abc659c10
----------------------------------------------------------------------