[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 562aea13e1078bde1319779bc7bbebea4b43
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 562aea13e1078bde1319779bc7bbebea4b43094a |
Date: |
Fri, 18 Apr 2008 00:05:54 +0200 |
-----------------------------------------------------------------
Revision: 562aea13e1078bde1319779bc7bbebea4b43094a
Ancestor: 5ba5a00bdcb283440c11ccc92bcacdf7215f0cd1
Ancestor: 77795d2b934d4adad8b58fd807c4fd5bd52bde99
Author: address@hidden
Date: 2008-04-17T21:21:25
Branch: net.venge.monotone.automate_show_conflict
Added files:
tests/automate_show_conflicts/__driver__.lua
tests/automate_show_conflicts/expected-attribute-attached.stdout
tests/automate_show_conflicts/expected-attribute-detached.stdout
tests/automate_show_conflicts/expected-content-attached.stdout
tests/automate_show_conflicts/expected-content-detached.stdout
tests/automate_show_conflicts/expected-directory-loop.stdout
tests/automate_show_conflicts/expected-duplicate-add-rename.stdout
tests/automate_show_conflicts/expected-duplicate-adds.stdout
tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout
tests/automate_show_conflicts/expected-duplicate-renames.stdout
tests/automate_show_conflicts/expected-invalid-add.stdout
tests/automate_show_conflicts/expected-invalid-rename.stdout
tests/automate_show_conflicts/expected-missing-root.stdout
tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout
tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout
tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout
tests/automate_show_conflicts/expected-multiple-names.stdout
tests/automate_show_conflicts/expected-orphaned-add.stdout
tests/automate_show_conflicts/expected-orphaned-rename.stdout
tests/automate_show_conflicts/expected-unrelated-projects.stdout
tests/automate_show_conflicts_defaults/__driver__.lua
tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
tests/resolve_duplicate_name_conflict/__driver__.lua
tests/wrong_options_override_workspace_options/__driver__.lua
Added directories:
tests/automate_show_conflicts
tests/automate_show_conflicts_defaults
tests/resolve_duplicate_name_conflict
tests/wrong_options_override_workspace_options
Modified files:
NEWS automate.cc cmd_automate.cc cmd_merging.cc
diff_patch.cc diff_patch.hh merge.cc monotone.texi
roster_merge.cc roster_merge.hh
tests/common/test_utils_inventory.lua
tests/conflict_messages/__driver__.lua
tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
tests/non_workspace_keydir/__driver__.lua work.cc
ChangeLog:
propagate from branch 'net.venge.monotone' (head
5ba5a00bdcb283440c11ccc92bcacdf7215f0cd1)
to branch 'net.venge.monotone.automate_show_conflict' (head
77795d2b934d4adad8b58fd807c4fd5bd52bde99)
monotone --db={your.database} diff
--revision=5ba5a00bdcb283440c11ccc92bcacdf7215f0cd1
--revision=562aea13e1078bde1319779bc7bbebea4b43094a
monotone --db={your.database} diff
--revision=77795d2b934d4adad8b58fd807c4fd5bd52bde99
--revision=562aea13e1078bde1319779bc7bbebea4b43094a
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 562aea13e1078bde1319779bc7bbebea4b43094a,
monotone <=