Fixed issue #155: Fix SVN Rebase sets upstream as remotes/trunk

miss setup upstream of rebase dialog

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
index 3f86c42..7a08704 100644 (file)
--- a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
+++ b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp
@@ -64,6 +64,8 @@ bool SVNRebaseCommand::Execute()
                out=out.Tokenize(_T("\n"),start);\r
        }\r
 \r
                out=out.Tokenize(_T("\n"),start);\r
        }\r
 \r

+       dlg.m_Upstream=out;\r
+\r

        if(dlg.DoModal() == IDOK)\r
        {\r
                bRet=true;\r
        if(dlg.DoModal() == IDOK)\r
        {\r
                bRet=true;\r