[Monotone-commits-diffs] net.venge.monotone: a570769b62c58e0fb571310bc231419291a55391

[code]

revision:            a570769b62c58e0fb571310bc231419291a55391
date:                2011-05-14T10:16:08
author:              Thomas Moschny <address@hidden>
branch:              net.venge.monotone
changelog:
* src/options_list.hh: bugfix: the c_str() of a temporary object
  is no longer valid after its destruction, so make a copy.

manifest:
format_version "1"

new_manifest [31e4615125f9b826e10d366332b3c0000a86cfac]

old_revision [9141410f0551e6e01299c9846a8223c398f710cc]

patch "src/options_list.hh"
 from [0462e302b89179f4acb28ecb91f4255140d4a4a7]
   to [27c44e89ebc9a828ac0a7b91505f997884646062]
============================================================
--- src/options_list.hh	0462e302b89179f4acb28ecb91f4255140d4a4a7
+++ src/options_list.hh	27c44e89ebc9a828ac0a7b91505f997884646062
@@ -381,9 +381,9 @@ SIMPLE_OPTION(move_conflicting_paths,
 SIMPLE_OPTION(move_conflicting_paths,
               "move-conflicting-paths/no-move-conflicting-paths",
               bool,
-              (F("move conflicting, unversioned paths into '%s' "
+              strdup((F("move conflicting, unversioned paths into '%s' "
                  "before proceeding with any workspace change") %
-                 bookkeeping_resolutions_dir).str().c_str())
+                      bookkeeping_resolutions_dir).str().c_str()))
 
 OPTSET_REL(globals, ssh_sign)
 SIMPLE_INITIALIZED_OPTION(ssh_sign, "ssh-sign", enum_string, "yes,no,only,check",