[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 77795d2b934d4adad8b58fd807c4fd5bd52b
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 77795d2b934d4adad8b58fd807c4fd5bd52bde99 |
Date: |
Thu, 17 Apr 2008 12:06:14 +0200 |
-----------------------------------------------------------------
Revision: 77795d2b934d4adad8b58fd807c4fd5bd52bde99
Ancestor: f2422e975f4a7e17bf41fdc4ea08bcf04c274aa7
Author: address@hidden
Date: 2008-04-17T09:26:39
Branch: net.venge.monotone.automate_show_conflict
Modified files:
cmd_merging.cc roster_merge.cc
tests/automate_show_conflicts_defaults/__driver__.lua
tests/non_workspace_keydir/__driver__.lua
tests/resolve_duplicate_name_conflict/__driver__.lua
ChangeLog:
Fix problems due to merge, mostly hexenc ids. Improve tests of automate
show_conflicts.
* cmd_merging.cc (show_conflicts_core): Use push_binary_pair instead of
push_hex_pair for revision ids.
* roster_merge.cc (put_added_conflict_left)
(put_added_conflict_right, put_rename_conflict_left)
(put_rename_conflict_right, put_attr_conflict, put_content_conflict):
Use push_binary_pair instead of push_hex_pair for file ids.
* tests/automate_show_conflicts_defaults/__driver__.lua: Delete
extraneous statements.
* tests/non_workspace_keydir/__driver__.lua: Set APPDATA to avoid user keys.
* tests/resolve_duplicate_name_conflict/__driver__.lua: Demonstrate
getting a file id from automate show_conflicts output.
monotone --db={your.database} diff
--revision=f2422e975f4a7e17bf41fdc4ea08bcf04c274aa7
--revision=77795d2b934d4adad8b58fd807c4fd5bd52bde99
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 77795d2b934d4adad8b58fd807c4fd5bd52bde99,
monotone <=