Заметки с меткой SVN

Linux: use "-" instead of "/"!
Diff
Select Edit | Preferences.
Go to Tools > Diff Tools.
Click Add.
File Pattern: *
Select External diff tool.
Command: C:∖Program Files (x86)∖Beyond Compare 4∖bcomp.exe
Arguments: /readonly /lefttitle="${leftTitle}" /righttitle="${rightTitle}" "${leftFile}" "${rightFile}"

Merge
Select Edit | Preferences.
Go to Tools > Conflict Solvers.
Click Add.
File Pattern: *
Select External Conflict Solver.
Command: C:∖Program Files (x86)∖Beyond Compare 4∖bcomp.exe
Arguments: "${leftFile}" "${rightFile}" "${baseFile}" /mergeoutput="${mergedFile}"

Diff:
"C:∖Program Files∖Araxis∖Araxis Merge∖compare.exe" /max /wait /title1:%bname /title2:%yname %base %mine

Patch viewer
C:∖Program Files∖Araxis∖Araxis Merge∖AraxisSVNDiff.exe

http://codetunnel.com/tortoisesvn-basics-tutorial/#SetupBeyo ndCompare

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

Merge:
"C:∖Program Files∖Beyond Compare 3∖BComp.exe" %mine %theirs "" %merged /title1=%yname /title2=%tname /title4="Output"

http://www.scootersoftware.com/vbulletin/showthread.php?3699-TortoiseSVN-integration&s=93b8a750bad1134d9f273ec5334a734c

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