← Back to branch summary

~ubuntu-branches/ubuntu/natty/codelite/natty

« back to all changes in this revision

Viewing changes to Subversion2/subversion_view.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2010-11-04 13:45:10 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20101104134510-xndpia79apes2s8u
Tags: 2.8.0.4537~dfsg-1
* New upstream release.
* Update debian/gbp.conf.
* Rename and refresh 01_x-terminal-emulator.patch.
* Refresh debian/patches/03_move-helper-binaries.patch
* Refresh debian/patches/04_configure.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Subversion2/subversion_view.cpp
690
690
                return;
691
691
        }
692
692
 
693
 
        bool nonInteractive = m_plugin->GetNonInteractiveMode(event);
694
 
        command << m_plugin->GetSvnExeName(nonInteractive) << loginString << wxT(" resolved ");
 
693
        command << m_plugin->GetSvnExeName(false) << loginString << wxT(" resolved ");
695
694
 
696
695
        // Concatenate list of files to be updated
697
696
        for (size_t i=0; i<m_selectionInfo.m_paths.GetCount(); i++) {