TortoiseSVN integration

[orip]

Hi,

Sorry if I'm rehashing this, but I couldn't find updated command-lines to configure TortoiseSVN's external diff and merge with for BC3.

Anyone have them?

Thanks!

[Craig]

Diff:
"C:\Program Files\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

Merge (v3 Pro):
"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

Merge (v3 Std):
"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs /mergeoutput=%merged

[outspokengolem]

Is there any way to automatically svn resolved the merged file after it is saved?

[Craig]

Yes, you can auto-resolve using TortoiseSVN, but it requires a bit of setup to do.

Save the attached text file in your BC3 install directory as "BComp.vbs".
If you've installed somewhere besides C:\Program Files\Beyond Compare 3 you'll need to modify the first line, and if you installed TortoiseSVN to somewhere other than C:\Program Files\TortoiseSVN you'll need to modify the second from last line as well.
Follow the steps for setting up 3-way merge for TortoiseSVN from our VCS (http://www.scootersoftware.com/support.php?zz=kb_vcs.php) page, except add "wscript " at the start of the command line and change "BComp.exe" to "BComp.vbs", so you end up with:
wscript "C:\Program Files\Beyond Compare 3\BComp.vbs"
%mine %theirs %base %merged /title1=%yname /title2=%tname
/title3=%bname /title4=%mname


If you save the merge file it will resolve it automatically. If you want it to ask for confirmation remove /noquestion from the second to last line. if you exit without saving it won't resolve.

[stucampbell]

Thanks. This is much easier to use than the Tortoise Diff tool.

I had to modify the first line to get it to work. You need quotes because of the spaces in the path.

SCmdLine = """C:\Program Files\Beyond Compare 3\BComp.exe "" "

[VOODOOS!L]

could you provide more information on this quick reply? i understand how to install it, but how is it used? what is the benefit of this compared to the other merge commandline?

[Craig]

By using that command line and the associated VBscript file BC will tell TortoiseSVN that the merge was successful so TortoiseSVN will remove the "filename.txt.mine", "filename.txt.r123", and "filename.txt.r234" files and change the file's icon from the "conflict" icon to the "changed" icon. If you use the command line we normally suggest you'll need to manually use the TortoiseSVN->Resolved... menu item after you save the merge result and exit BC.

[VOODOOS!L]

Great. Thanks for quick reply. Can be handy indeed.

[free2create]

Yes, you can auto-resolve using TortoiseSVN, but it requires a bit of setup to do.

Save the attached text file in your BC3 install directory as "BComp.vbs".
If you've installed somewhere besides C:\Program Files\Beyond Compare 3 you'll need to modify the first line, and if you installed TortoiseSVN to somewhere other than C:\Program Files\TortoiseSVN you'll need to modify the second from last line as well.
Follow the steps for setting up 3-way merge for TortoiseSVN from our VCS (http://www.scootersoftware.com/support.php?zz=kb_vcs.php) page, except add "wscript " at the start of the command line and change "BComp.exe" to "BComp.vbs", so you end up with:
wscript "C:\Program Files\Beyond Compare 3\BComp.vbs"
%mine %theirs %base %merged /title1=%yname /title2=%tname
/title3=%bname /title4=%mname


If you save the merge file it will resolve it automatically. If you want it to ask for confirmation remove /noquestion from the second to last line. if you exit without saving it won't resolve.
Are these steps to use with TortoiseSVN still necessary ?
Is the BComp.vbs file the same as the BComp.com/exe that ships with BC3 now ?

[Aaron]

Hello,

No, this is not built-in to BC3. You still need the vbscript if you want it to resolve automatically.

Otherwise, you can select the files after the merge, and mark as Resolved manually.

[ZAO]

Hi,
I'm using BC3 (Standard Version) and TortoiseSVN. I can use the mentioned string to call BC3 as external merge tool - one side shows the new file of the repository and the other side shows my locally changed file.

This looks like the "normal" diff - can BC3 shows the merge conflicts also? Or do I need the Prof-Version for this?

If I do an SVN update and click on the conflicted files, I can merge manually the changes with BC3 to my file and exit BC3 - it asks for saving the changed to my local file. But I have configured another filename with "/mergeoutput". How do I have to use the commandline parameter?

Please help. Thanks.

Regards,
ZAO

[Aaron]

Hello,

Mergeoutput is a parameter for our Text Merge session, which is a Pro feature. Our Text Compare session has a Left and Right side, while our Text Merge session can have a Left, Right, Center, and Output.
If you would like to evaluate the Pro version, you can do so by reverting to Trial mode:
http://www.scootersoftware.com/support.php?zz=kb_evalpro.php

To setup a 2way Merge in BC3 Std, you can follow the guide under TortoiseSVN here:
http://www.scootersoftware.com/support.php?zz=kb_vcs.php

[ZAO]

Mergeoutput is a parameter for our Text Merge session, which is a Pro feature. [...] To setup a 2way Merge in BC3 Std, you can follow the guide under TortoiseSVN here:
http://www.scootersoftware.com/support.php?zz=kb_vcs.php

But on this page, the "mergeoutput"-parameter is mentioned for BC3 Std:

2-Way Merge (v3 Std, v2)
Use the same steps as above, but use the command line:
"C:\Program Files\Beyond Compare 3\BComp.exe" %mine %theirs /mergeoutput=%merged


Can I use this paramter for BC3 Std or only for Pro? If it's available only for Pro, please correct the support page.

Regards,
ZAO

[Aaron]

The command line should be /savetarget=

I'll update the KB article shortly.

[gdangoor]

Yes, you can auto-resolve using TortoiseSVN, but it requires a bit of setup to do.

Save the attached text file in your BC3 install directory as "BComp.vbs".
If you've installed somewhere besides C:\Program Files\Beyond Compare 3 you'll need to modify the first line, and if you installed TortoiseSVN to somewhere other than C:\Program Files\TortoiseSVN you'll need to modify the second from last line as well.
Follow the steps for setting up 3-way merge for TortoiseSVN from our VCS (http://www.scootersoftware.com/support.php?zz=kb_vcs.php) page, except add "wscript " at the start of the command line and change "BComp.exe" to "BComp.vbs", so you end up with:
wscript "C:\Program Files\Beyond Compare 3\BComp.vbs"
%mine %theirs %base %merged /title1=%yname /title2=%tname
/title3=%bname /title4=%mname


If you save the merge file it will resolve it automatically. If you want it to ask for confirmation remove /noquestion from the second to last line. if you exit without saving it won't resolve.

Hi,

Im currently using RapidSvn for in linux.
1. is there another way of resolving the conflict without using the script ?
2. will it work on linux ?
3. if so should i make changed to the script ?

thanks.

[Aaron]

Hello,

The VBS script and TortoiseSVn are generally Windows-only. The overall goal of the script was to call with the command line arguments to mark as resolved.

Once merged, I assume RapidSVN is not marking your files as resolved? How did you define BC3 in your 'Programs' tab (documented here: http://www.rapidsvn.org/index.php/OnlineHelp:Contents#Merging )