[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 5b5e64254e65192290c2407115467d56e7b8
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 5b5e64254e65192290c2407115467d56e7b8a6de |
Date: |
Sat, 19 Apr 2008 18:06:04 +0200 |
-----------------------------------------------------------------
Revision: 5b5e64254e65192290c2407115467d56e7b8a6de
Ancestor: 77795d2b934d4adad8b58fd807c4fd5bd52bde99
Author: address@hidden
Date: 2008-04-19T15:52:18
Branch: net.venge.monotone.automate_show_conflict
Modified files:
cmd_merging.cc lua-testsuite.lua
tests/automate_show_conflicts_defaults/__driver__.lua
ChangeLog:
Allow and test for automate show_conflicts outside workspace.
* cmd_merging.cc (CMD_AUTOMATE show_conflicts): Allow --branch option,
nice error message if no branch specified.
* lua-testsuite.lua (mtn_outside_ws): New function returning command for
use outside a workspace; --root is not specified.
* tests/automate_show_conflicts_defaults/__driver__.lua: Improve tests,
test for error messages.
monotone --db={your.database} diff
--revision=77795d2b934d4adad8b58fd807c4fd5bd52bde99
--revision=5b5e64254e65192290c2407115467d56e7b8a6de
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 5b5e64254e65192290c2407115467d56e7b8a6de,
monotone <=