User Interface Issue/Niggle

[Guest]

Hi

I have three minor issues - the first one has been solved by v. 2.0.3 whereby when ameding an aspx page in vs using the designer, only the aspx was checked out. This has been altered to replicate vss. Thanks guys!

My second niggle is that the three pane merge display shows Target - Result - Original which in my mind should be Origin - Result - Target.

Finally it woud be nice if the branch facility put a comment as well as an action indicating where the branch was made as it makes things more obvios when merging the branches back, especially if the coder omits to enter a comment for the change he has made.

Richard

[dan]

My second niggle is that the three pane merge display shows Target - Result - Original which in my mind should be Origin - Result - Target.

Actually, you can configure this, although it isn't very straighforward. In the Tools->Options->Diff/Merge pane, you can switch the arguments for working path and "other" path around, and this will switch which file appears on which side of the merged file.

Try this as the argument string, and it should produce what you want:

/ro1 /ro3 /merge /title1:"%OTHER_LABEL%" /title2:"%DEST_LABEL%" /title3:"%WORKING_LABEL%" /result:"%DEST_PATH%" "%OTHER_PATH%" "%BASELINE_PATH%" "%WORKING_PATH%"

Finally it woud be nice if the branch facility put a comment as well as an action indicating where the branch was made as it makes things more obvios when merging the branches back, especially if the coder omits to enter a comment for the change he has made.

Yes, I believe this is already on our list.

Thanks for the feedback.