[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision 7ab23cfe863526079fd6407f129899b1dea8a4
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision 7ab23cfe863526079fd6407f129899b1dea8a4e1 |
Date: |
Sat, 1 Nov 2008 17:13:27 +0100 |
-----------------------------------------------------------------
Revision: 7ab23cfe863526079fd6407f129899b1dea8a4e1
Ancestor: 080c95de98641187de244dd1f2a63d5faf75fb6f
Author: address@hidden
Date: 2008-10-31T18:24:02
Branch: net.venge.monotone.resolve_conflicts
Modified files:
NEWS cmd_merging.cc commands.cc monotone.texi
options_list.hh
tests/schema_migration_with_rosterify/__driver__.lua
ChangeLog:
update NEWS for 'mtn conficts'. add --no-prefix option for commit messages.
* NEWS: describe 'mtn conflicts'. merge, propagate take --message; current
message is prepended to user message. --no_prefix removes the prefix.
* cmd_merging.cc (CMD(propagate)): simplify messages params.
* commands.cc (process_commit_message_args): handle no_prefix option
* options_list.hh (OPTION): add --no-prefix option.
* monotone.texi (Tree merge, propagate): doc commit message options.
* tests/schema_migration_with_rosterify/__driver__.lua: use --no-prefix;
now passes.
txtjHKGP_GNZV.txt
Description: Diff [080c95de98641187de244dd1f2a63d5faf75fb6f] -> [7ab23cfe863526079fd6407f129899b1dea8a4e1]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision 7ab23cfe863526079fd6407f129899b1dea8a4e1,
monotone <=