Index: branches/2018Q2/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp
===================================================================
--- branches/2018Q2/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp	(nonexistent)
+++ branches/2018Q2/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp	(revision 467781)
@@ -0,0 +1,11 @@
+--- src/blockchain_utilities/blockchain_blackball.cpp.orig	2018-04-12 18:35:24 UTC
++++ src/blockchain_utilities/blockchain_blackball.cpp
+@@ -165,7 +165,7 @@ int main(int argc, char* argv[])
+       "blackball-db-dir", "Specify blackball database directory",
+       get_default_db_path(),
+       {{ &arg_testnet_on, &arg_stagenet_on }},
+-      [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) {
++      [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) -> std::string {
+         if (testnet_stagenet[0])
+           return (boost::filesystem::path(val) / "testnet").string();
+         else if (testnet_stagenet[1])

Property changes on: branches/2018Q2/net-p2p/monero-cli/files/patch-src_blockchain__utilities_blockchain__blackball.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q2/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp
===================================================================
--- branches/2018Q2/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp	(nonexistent)
+++ branches/2018Q2/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp	(revision 467781)
@@ -0,0 +1,11 @@
+--- src/cryptonote_core/cryptonote_core.cpp.orig	2018-04-12 18:30:36 UTC
++++ src/cryptonote_core/cryptonote_core.cpp
+@@ -81,7 +81,7 @@ namespace cryptonote
+   , "Specify data directory"
+   , tools::get_default_data_dir()
+   , {{ &arg_testnet_on, &arg_stagenet_on }}
+-  , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) {
++  , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) -> std::string {
+       if (testnet_stagenet[0])
+         return (boost::filesystem::path(val) / "testnet").string();
+       else if (testnet_stagenet[1])

Property changes on: branches/2018Q2/net-p2p/monero-cli/files/patch-src_cryptonote__core_cryptonote__core.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q2/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h
===================================================================
--- branches/2018Q2/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h	(nonexistent)
+++ branches/2018Q2/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h	(revision 467781)
@@ -0,0 +1,20 @@
+--- src/daemon/command_line_args.h.orig	2018-04-12 18:39:37 UTC
++++ src/daemon/command_line_args.h
+@@ -42,7 +42,7 @@ namespace daemon_args
+   , "Specify configuration file"
+   , (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".conf")).string()
+   , {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }}
+-  , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) {
++  , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) -> std::string {
+       if (testnet_stagenet[0] && defaulted)
+         return (daemonizer::get_default_data_dir() / "testnet" /
+                 std::string(CRYPTONOTE_NAME ".conf")).string();
+@@ -57,7 +57,7 @@ namespace daemon_args
+   , "Specify log file"
+   , (daemonizer::get_default_data_dir() / std::string(CRYPTONOTE_NAME ".log")).string()
+   , {{ &cryptonote::arg_testnet_on, &cryptonote::arg_stagenet_on }}
+-  , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) {
++  , [](std::array<bool, 2> testnet_stagenet, bool defaulted, std::string val) -> std::string {
+       if (testnet_stagenet[0] && defaulted)
+         return (daemonizer::get_default_data_dir() / "testnet" /
+                 std::string(CRYPTONOTE_NAME ".log")).string();

Property changes on: branches/2018Q2/net-p2p/monero-cli/files/patch-src_daemon_command__line__args.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q2/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp
===================================================================
--- branches/2018Q2/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp	(nonexistent)
+++ branches/2018Q2/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp	(revision 467781)
@@ -0,0 +1,11 @@
+--- src/wallet/wallet2.cpp.orig	2018-03-24 15:56:14 UTC
++++ src/wallet/wallet2.cpp
+@@ -145,7 +145,7 @@ struct options {
+     "shared-ringdb-dir", tools::wallet2::tr("Set shared ring database path"),
+     get_default_ringdb_path(),
+     testnet,
+-    [](bool testnet, bool defaulted, std::string val) {
++    [](bool testnet, bool defaulted, std::string val) -> std::string {
+       if (testnet)
+         return (boost::filesystem::path(val) / "testnet").string();
+       return val;

Property changes on: branches/2018Q2/net-p2p/monero-cli/files/patch-src_wallet_wallet2.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 467780)
+++ branches/2018Q2	(revision 467781)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r467214