Say a person has:
PAGER=D:\tools\less.exe
P4DIFF=D:\bc3\bcompare.exe
P4MERGE=bc3merge.bat
with bc3merge.bat containing:
call D:\bc3\bcompare.exe %2 %3 %1 %4 /fv="TextMerge"
And then the user executes:
p4 resolve somefile
And hits 'd' for diff
This will spawn a BC3 window as a merge rather than a diff, because p4 spawns BC3 like so:
"D:\bc3\bcomp.exe" "localfile" "perforcefile" "|" "D:\tools\less.exe"
Can you guys sniff the third param and if it comes in as a pipe treat it as a diff?
This way I don't have to unset the PAGER every time I want to resolve - diff.
PAGER=D:\tools\less.exe
P4DIFF=D:\bc3\bcompare.exe
P4MERGE=bc3merge.bat
with bc3merge.bat containing:
call D:\bc3\bcompare.exe %2 %3 %1 %4 /fv="TextMerge"
And then the user executes:
p4 resolve somefile
And hits 'd' for diff
This will spawn a BC3 window as a merge rather than a diff, because p4 spawns BC3 like so:
"D:\bc3\bcomp.exe" "localfile" "perforcefile" "|" "D:\tools\less.exe"
Can you guys sniff the third param and if it comes in as a pipe treat it as a diff?
This way I don't have to unset the PAGER every time I want to resolve - diff.
Comment