[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 3ed674ef92f993c2309d7c2c53f767c38e9283
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 3ed674ef92f993c2309d7c2c53f767c38e928325 |
Date: |
Thu, 8 Feb 2007 02:05:18 +0100 |
-----------------------------------------------------------------
Revision: 3ed674ef92f993c2309d7c2c53f767c38e928325
Ancestor: 3105412040fc652d8469a130e165e8dc11db65cb
Ancestor: 473c5618ecad08ef37749c58964378823ab7080e
Author: address@hidden
Date: 2007-02-08T00:55:45
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/merge_into_workspace_same_rev/__driver__.lua
tests/two_parent_workspace_commands_that_fail/__driver__.lua
tests/two_parent_workspace_pluck/__driver__.lua
Added directories:
tests/merge_into_workspace_same_rev
tests/two_parent_workspace_commands_that_fail
tests/two_parent_workspace_pluck
Modified files:
ChangeLog NEWS cmd_diff_log.cc cmd_merging.cc
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
testsuite.lua work.cc
ChangeLog:
merge of '3105412040fc652d8469a130e165e8dc11db65cb'
and '473c5618ecad08ef37749c58964378823ab7080e'
monotone --db={your.database} diff
--revision=3105412040fc652d8469a130e165e8dc11db65cb
--revision=3ed674ef92f993c2309d7c2c53f767c38e928325
monotone --db={your.database} diff
--revision=473c5618ecad08ef37749c58964378823ab7080e
--revision=3ed674ef92f993c2309d7c2c53f767c38e928325
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 3ed674ef92f993c2309d7c2c53f767c38e928325,
monotone <=