CODEWITHSUNDEEP
visual-studiotortoisesvnperforcep4v
BalintN
BalintN

Reputation: 141

How to configure Visual Studio to use Perforce Merge (P4Merge)?

Can I use Perforce merge with Visual Studio and Tortoise SVN?

How can I configure them?

The reason for asking and answering it is that personally I'm a big fan of Perforce, however at the moment I'm working in an SVN environment. This is to document how to configure them for my own and everyone else's benefit.

Upvotes: 1

Views: 985

Answers (1)

BalintN
BalintN

Reputation: 141

To configure Visual Studio

  • Go to Visual Studio / Options / Source Control / Subversion User tools, and set it like this
  • External diff tool C:\Program Files\Perforce\p4merge.exe -dw $(Base) $(Mine)
  • External merge tool C:\Program Files\Perforce\p4merge.exe -dw -nb $(BaseName) -nl $(MineName) -nr $(TheirName) -nm $(MergedName) $(Base) $(Mine) $(Theirs) $(Merged)

enter image description here

To configure TortoiseSVN:

  • Start / All Programs / TortoiseSVN / Settings
  • Set Diff viewer to C:\Program Files\Perforce\p4merge.exe -dw %base %mine
  • Set Merge Tool to C:\Program Files\Perforce\p4merge.exe -dw -nb %bname -nl %yname -nr %tname -nm Merged %base %mine %theirs %merged

Upvotes: 3

Related Questions