# # patch "ChangeLog" # from [f3bcd7b4e35e5ab3a18540a0e7243efc69e3966c] # to [90278238f8e97a5343400e1ca662beb76d9babdb] # # patch "commands.cc" # from [081578684cdedbc86c829599e9e391aa8910b853] # to [e5a84234e119daa9545a1714e10ce70f4536f24c] # ======================================================================== --- ChangeLog f3bcd7b4e35e5ab3a18540a0e7243efc69e3966c +++ ChangeLog 90278238f8e97a5343400e1ca662beb76d9babdb @@ -1,9 +1,13 @@ 2005-08-22 Nathaniel Smith + * commands.cc (update): Don't use F() to indent things. + +2005-08-22 Nathaniel Smith + * commands.cc (dump_diffs): Don't use F() to create diff headers. (commands::process): Put '' in the log message to make Benoît Dejean happy ;-). - + 2005-08-22 Nathaniel Smith * po/LINGUAS, po/ja.po: Add Japanese translation by Satoru SATOH. ======================================================================== --- commands.cc 081578684cdedbc86c829599e9e391aa8910b853 +++ commands.cc e5a84234e119daa9545a1714e10ce70f4536f24c @@ -2824,7 +2824,7 @@ P(F("multiple update candidates:\n")); for (set::const_iterator i = candidates.begin(); i != candidates.end(); ++i) - P(F(" %s\n") % describe_revision(app, *i)); + P(boost::format(" %s\n") % describe_revision(app, *i)); P(F("choose one with 'monotone update -r'\n")); N(false, F("multiple candidates remain after selection")); }