Go Back   Scooter Forums > Beyond Compare 3 Discussion > Version Control
Register FAQ Search Today's Posts Mark Forums Read

Reply
 
Thread Tools Display Modes
  #1  
Old 01-Dec-2011, 06:53 AM
glewis@agtrax.com glewis@agtrax.com is offline
New User
 
Join Date: Nov 2011
Posts: 2
Default Bcomp.exe Serena

We have just upgraded from BC2 to BC3. We have copied Bcomp.exe to PVCSmerge.exe in the serena folder. When we compare 2 files and one of them is writeable, it will not let us merge into the writable. We go to Session settings and both files have Disable Editing checked. We uncheck the file we want to merge into and it allows us to merge into it, but upon saving the merged changes, it doesn't save to the actual file. It appears to be saving to the temporary file even though it lists the actual file in the File 2: dialog.

This worked using BC2.

Please advise.
Reply With Quote
  #2  
Old 01-Dec-2011, 03:35 PM
Aaron Aaron is offline
Team Scooter
 
Join Date: Oct 2007
Location: Madison, WI
Posts: 5,444
Default

Hello,

Are you currently running BC3 Std or Pro edition? BC3 Pro should launch our Text Merge session and allow merging into the Output pane (with 3 input panes). BC3 Std does not support the Text Merge session type or merging with PVCS, but can be used to Diff.

A Text Merge should look like this:
http://www.scootersoftware.com/morei...shot=TextMerge
__________________
Aaron P Scooter Software
Reply With Quote
  #3  
Old 02-Dec-2011, 07:16 AM
glewis@agtrax.com glewis@agtrax.com is offline
New User
 
Join Date: Nov 2011
Posts: 2
Default

We are using BC3 Std. Our source code editor allows us to do a diff between our working copy and a revision in PVCS. It gets the revision we wish to diff to a temporary file and then compares it to our working copy. In BC2, we were able to merge code from the revision in PVCS into our working copy. In BC3, our working copy (even though it is writable on disk), is pulled into BC3 with Disable Editing checked. If we uncheck the Disable Editing for that pane, it will allow us to merge code into it, but when you save the changes they are not getting saved to our working copy. It appears that our working copy gets translated to a temporary file as well and the changes made are saved to it. The changes never make it back into our working copy.

In the interim, I have reinstalled BC2 and am using it's PVCSmerge.exe with Serena.
Attached Images
File Type: png BC3Merge.PNG (142.0 KB, 4 views)
Reply With Quote
  #4  
Old 05-Dec-2011, 03:42 PM
Craig Craig is offline
Team Scooter
 
Join Date: Oct 2007
Location: Madison, WI
Posts: 2,097
Default

The built-in support (that replaces the BC2 behavior) should only disable editing for files that have a plain-text title, which should indicate a temp file. In your screenshot I would have expected the left file to be writable.

Download and install Process Explorer. While BC3 is running with a comparison open use process explorer to view the PVCSMerge.exe process properties and see what its command line is. It should have a single temp file as an argument. Email that file to support@scootersoftware.com and I'll look into it.
__________________
Craig P Scooter Software
Reply With Quote
  #5  
Old 09-Dec-2011, 02:41 PM
Aaron Aaron is offline
Team Scooter
 
Join Date: Oct 2007
Location: Madison, WI
Posts: 5,444
Default

Hello,

When/if you email support@scootersoftware.com, please also include a link to this forum thread for us to reference. Thanks.
__________________
Aaron P Scooter Software
Reply With Quote
Reply

Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Forum Jump


All times are GMT -6. The time now is 11:22 PM.


Powered by vBulletin® Version 3.7.1
Copyright ©2000 - 2013, Jelsoft Enterprises Ltd.