[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision c17d3f3a5ec96fe0e294b8bcffb53bc46553
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision c17d3f3a5ec96fe0e294b8bcffb53bc465530f7b |
Date: |
Sun, 29 Jun 2008 13:45:43 +0200 |
-----------------------------------------------------------------
Revision: c17d3f3a5ec96fe0e294b8bcffb53bc465530f7b
Ancestor: 598003d09dcb8002a8fd2d55d56c6d4ac0e243e1
Author: address@hidden
Date: 2008-06-19T06:40:51
Branch: net.venge.monotone.automate_show_conflict
Modified files:
cmd_merging.cc roster_merge.cc
ChangeLog:
Improve 'update' use of full tree merge; only one existing lua test failing
(updating_through_a_pivot_root).
* cmd_merging.cc (CMD update): only use full tree merge if no explicit
rev given on cmd line.
* roster_merge.cc (parse_resolve_conflicts_opts): Nice error messages for
unsupported conflict resolutions.
monotone --db={your.database} diff
--revision=598003d09dcb8002a8fd2d55d56c6d4ac0e243e1
--revision=c17d3f3a5ec96fe0e294b8bcffb53bc465530f7b
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision c17d3f3a5ec96fe0e294b8bcffb53bc465530f7b,
monotone <=