[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 0206ca3b713fe2b78304a76be7e37c422e1b
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 0206ca3b713fe2b78304a76be7e37c422e1b1378 |
Date: |
Wed, 7 Feb 2007 21:05:41 +0100 |
-----------------------------------------------------------------
Revision: 0206ca3b713fe2b78304a76be7e37c422e1b1378
Ancestor: 8fb58caca4fa27408211c789f84c96c881755013
Author: address@hidden
Date: 2007-02-07T19:34:12
Branch: net.venge.monotone
Renamed entries:
tests/drop_directory_with_unversioned_files_and_merge to
tests/drop_directory_with_unversioned_files_and_update
Modified files:
ChangeLog NEWS
tests/(imp)_deleting_directories/__driver__.lua
tests/annotate_file_whose_name_changed/__driver__.lua
tests/drop_directory_with_unversioned_files_and_update/__driver__.lua
tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua
tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua
tests/merging_a_rename_twice/__driver__.lua
tests/merging_adds/__driver__.lua
tests/renaming_a_deleted_file/__driver__.lua
tests/repeatedly_exchanging_work_via_netsync/__driver__.lua
tests/schema_migration/__driver__.lua
tests/schema_migration_with_rosterify/__driver__.lua
tests/test_a_merge_7/__driver__.lua
tests/update_clobbers_workspace/__driver__.lua
tests/update_does_not_stomp_non-monotone_files/__driver__.lua
work.cc
ChangeLog:
2007-02-07 Derek Scherger <address@hidden>
* NEWS: add notes about changes to update's behaviour
* tests/(imp)_deleting_directories/__driver__.lua:
* tests/annotate_file_whose_name_changed/__driver__.lua:
* tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua:
* tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua:
* tests/merging_a_rename_twice/__driver__.lua:
* tests/merging_adds/__driver__.lua:
* tests/renaming_a_deleted_file/__driver__.lua:
* tests/repeatedly_exchanging_work_via_netsync/__driver__.lua:
* tests/schema_migration/__driver__.lua:
* tests/schema_migration_with_rosterify/__driver__.lua:
* tests/test_a_merge_7/__driver__.lua:
add a few "remove" calls so that tests no longer require update to
clobber files
* tests/drop_directory_with_unversioned_files_and_merge: rename to ...
* tests/drop_directory_with_unversioned_files_and_update: ... this
and un-xfail
* tests/update_clobbers_workspace/__driver__.lua:
* tests/update_does_not_stomp_non-monotone_files/__driver__.lua:
adjust/un-xfail to account for update no longer clobbering
unversioned files
* work.cc:
(struct workspace_itemizer): new itemizer that builds a roster
which includes every node in the workspace
(struct simulated_working_tree): new working tree implementation
that update runs against to see if it will encounter any workspace
conflicts
(perform_content_update): use workspace_itemizer to create a
workspace roster and then apply the update cset against this with
simulated_working_tree to see if update will fail on something
obvious
monotone --db={your.database} diff
--revision=8fb58caca4fa27408211c789f84c96c881755013
--revision=0206ca3b713fe2b78304a76be7e37c422e1b1378
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 0206ca3b713fe2b78304a76be7e37c422e1b1378,
monotone <=