-----------------------------------------------------------------
Revision: 0abab2a67f3a4367cfd9b95ac448ac8bf301efeb
Ancestor: 97294a6260b662c53124a79e85c13139511bb472
Author: [email protected]
Date: 2009-05-09T17:06:31
Branch: net.venge.monotone
Modified files:
cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc
tests/resolve_conflicts_content/update-1
tests/resolve_conflicts_none/update-1
tests/update_loses_execute/__driver__.lua work.cc work.hh
ChangeLog:
reset attributes on changed files after they have been updated
* cmd_merging.cc (update, merge_into_workspace, pluck):
* cmd_netsync.cc (clone):
* cmd_ws_commit.cc (checkout, attr, set_attr): replace db argument to
perform_content_update with old and new rosters
* tests/resolve_conflicts_content/update-1:
* tests/resolve_conflicts_none/update-1: tweak for changes to update output
* tests/update_loses_execute/__driver__.lua: un-xfail
* work.{cc,hh} (apply_delta): change message to "updating" from "modifying"
(perform_pivot_root): rename new_roster to old_roster and add a real
new_roster that is the old_roster with the root swap change applied; replace
db argument to perform_content_update with old and new rosters
(perform_content_update): replace db argument with old and new rosters;
rename "roster" to "test_roster" which is used to test that changes apply
cleanly to the workspace before actually applying them; after applying
the cset re-set attributes on all files that had deltas since delta
application loses filesystem attribute settings
monotone --db={your.database} diff
--revision=97294a6260b662c53124a79e85c13139511bb472
--revision=0abab2a67f3a4367cfd9b95ac448ac8bf301efeb
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
