The leading provider of version control solution and TWAIN SDK
The leading provider of version control solution and TWAIN SDK

Dynamsoft Forums

Support for Version Control, Bug Tracking and Configuration Management Software
* Login   * Register
* FAQ    * Search

View unanswered posts | View active topics


Dynamsoft Forums » SourceAnywhere for VSS - Visual SourceSafe (VSS) Remote Access Add-On Tool » Microsoft Visual SourceSafe (VSS) Forum

It is currently Mon May 21, 2012 1:53 pm



Post new topic Reply to topic  Page 1 of 1
  [ 2 posts ] 
  Print view Previous topic | Next topic 
Author Message
sensorflo
 Post subject: VSSItem.Get: how to dedect wheter there was a merge conflict
PostPosted: Tue Dec 27, 2011 9:05 am 
Offline

Joined: Tue Dec 27, 2011 8:54 am
Posts: 1
How can I know after calling VSSItem.Get with VSSFLAG_REPMERGE whether there was a merge conflict or not? Especially if I do it on a project (i.e. VSSITEM_PROJECT rather than VSSITEM_FILE). I can only think of searching the new files for occurrences of "<<<<<<< ". But that is not really a fast solution. I use Visual Sourcesafe 6.0d.
Top
 Profile  
 
Catherine
 Post subject: Re: VSSItem.Get: how to dedect wheter there was a merge conflict
PostPosted: Fri Dec 30, 2011 11:19 pm 
Offline
User avatar

Joined: Tue Mar 08, 2005 12:23 am
Posts: 1489
sensorflo wrote:
How can I know after calling VSSItem.Get with VSSFLAG_REPMERGE whether there was a merge conflict or not?

I believe the SDK of MS VSS doesn't provide the capability to check whether there is a conflict when calling VSSItem.Get.

sensorflo wrote:
I can only think of searching the new files for occurrences of "<<<<<<< ". But that is not really a fast solution. I use Visual Sourcesafe 6.0d.

This is not straightfoward, though I think it's a good solution.

_________________
Catherine Sea
Dynamsoft Support Team
Dynamsoft - The leading provider of version control solution and TWAIN SDK
Source Control Software | Software Configuration Management | SCM Solution | Issue Tracking
SourceSafe (VSS) Remote/Web/Internet Access | SourceSafe (VSS) Replacement/Alternative | SourceSafe (VSS) Hosting|TFS Hosting
Follow me @Twitter, Facebook
Image

Top
 Profile  
 
Display posts from previous:  Sort by  
Post new topic Reply to topic  Page 1 of 1
  [ 2 posts ] 

Dynamsoft Forums » SourceAnywhere for VSS - Visual SourceSafe (VSS) Remote Access Add-On Tool » Microsoft Visual SourceSafe (VSS) Forum

It is currently Mon May 21, 2012 1:53 pm

Who is online

Users browsing this forum: No registered users and 0 guests

You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum

Search for:
Jump to:  
cron

Copyright © 2010 Dynamsoft Corporation. All Rights Reserved. | Knowledge Base | Source Control Blog