-----------------------------------------------------------------
Revision: b1cec3176fd56af29275c2b620f8766b4382eec8
Ancestor: 94f8ecff17c051478a5c7707ecc7bf747efe24aa
Author: [email protected]
Date: 2009-03-02T04:01:55
Branch: net.venge.monotone
Modified files:
NEWS cmd_merging.cc luaext_platform.cc monotone.texi
platform.hh std_hooks.lua
tests/attr_mtn_execute/__driver__.lua
tests/defecting_attributes/__driver__.lua unix/process.cc
win32/process.cc work.cc
ChangeLog:
make update clear execute permissions when mtn:execute is cleared
* NEWS: note this change in the "Bugs fixed" section
* cmd_merging.cc (add_dormant_attrs): new function to add attrs to child rosters
that exist in their parents
(three_way_merge): add_dormant_attrs to left and right rosters for all nodes
that exist in the ancestor roster
* luaext_platform.cc:
* platform.hh:
* unix/process.cc:
* win32/process.cc:
(make_executable): rename to ...
(set_executable) ... this
(clear_executable): new function to clear execute permission bits
* work.cc (editable_working_tree): add lua member initialized on construction
(editable_working_tree::clear_attr): replace FIXME with actual call to lua
hook
(editable_working_tree::set_attr): likewise
(workspace::perform_content_update): construct editable_working_tree with lua
reference
* std_hooks.lua (attr_functions): update definition of mtn:execute attr function
to call set_executable when attr value is "true" and clear_executable for any
other value
* monotone.texi (Attribute Handling): add missing word; update default
definition of mtn:execute attr function
* tests/attr_mtn_execute/__driver__.lua: un-xfail; replace .. string
concatenation of option arguments with commas
* tests/defecting_attributes/__driver__.lua: un-xfail
monotone --db={your.database} diff
--revision=94f8ecff17c051478a5c7707ecc7bf747efe24aa
--revision=b1cec3176fd56af29275c2b620f8766b4382eec8
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
