[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 14857fce558e1ec24f3776d78a69ea36d8d7f2
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 14857fce558e1ec24f3776d78a69ea36d8d7f2d7 |
Date: |
Thu, 8 Feb 2007 02:05:18 +0100 |
-----------------------------------------------------------------
Revision: 14857fce558e1ec24f3776d78a69ea36d8d7f2d7
Ancestor: 3e3a842f0dabb2070ebe6ddaf79ea84cd141ca61
Ancestor: 7c2ed47bfb2f61a21acbcaa0527c864275ad3428
Author: address@hidden
Date: 2007-02-08T00:51:22
Branch: net.venge.monotone.workspace-merge.noconflict
Renamed entries:
tests/drop_directory_with_unversioned_files_and_merge to
tests/drop_directory_with_unversioned_files_and_update
Added files:
tests/db_kill_rev_and_recommit/__driver__.lua
tests/magic__MTN_in_restrictions/__driver__.lua
tests/merge_into_workspace_same_rev/__driver__.lua
Added directories:
tests/db_kill_rev_and_recommit
tests/magic__MTN_in_restrictions
tests/merge_into_workspace_same_rev
Modified files:
ChangeLog NEWS charset.cc cmd.hh cmd_diff_log.cc
cmd_merging.cc cmd_ws_commit.cc file_io.cc paths.cc paths.hh
po/sv.po tests/(imp)_deleting_directories/__driver__.lua
tests/_MTN_case-folding_security_patch/__driver__.lua
tests/add_inside__MTN_/__driver__.lua
tests/annotate_file_whose_name_changed/__driver__.lua
tests/drop_directory_with_unversioned_files_and_update/__driver__.lua
tests/ls_unknown_in_subdir/__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/test_a_merge_8/__driver__.lua
tests/two_parent_workspace_commands_that_fail/__driver__.lua
tests/two_parent_workspace_pluck/__driver__.lua
tests/update_clobbers_workspace/__driver__.lua
tests/update_does_not_stomp_non-monotone_files/__driver__.lua
testsuite.lua work.cc
ChangeLog:
merge of '3e3a842f0dabb2070ebe6ddaf79ea84cd141ca61'
and '7c2ed47bfb2f61a21acbcaa0527c864275ad3428'
monotone --db={your.database} diff
--revision=3e3a842f0dabb2070ebe6ddaf79ea84cd141ca61
--revision=14857fce558e1ec24f3776d78a69ea36d8d7f2d7
monotone --db={your.database} diff
--revision=7c2ed47bfb2f61a21acbcaa0527c864275ad3428
--revision=14857fce558e1ec24f3776d78a69ea36d8d7f2d7
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 14857fce558e1ec24f3776d78a69ea36d8d7f2d7,
monotone <=