Welcome to Telelogic Product Support
  Home Downloads Knowledgebase Case Tracking Licensing Help Telelogic Passport
Telelogic SYNERGY (steve huntington)
Decrease font size
Increase font size
Topic Title: Forcing conflict resolutino during update
Topic Summary:
Created On: 7-Oct-2008 15:33
Status: Read Only
Linear : Threading : Single : Branch
Search Topic Search Topic
Topic Tools Topic Tools
Subscribe to this topic Subscribe to this topic
E-mail this topic to someone. E-mail this topic
Bookmark this topic Bookmark this topic
View similar topics View similar topics
View topic in raw text format. Print this topic.
 7-Oct-2008 15:33
User is offline View Users Profile Print this message


Frederic Nguyen

Posts: 1
Joined: 7-Oct-2008

Hello,

We are using the Synergy command lines for our overnight compilation. The batch intentionally changes the dlls and exe file versions, so that it is easier for us to maintain.

However, the update command fails when the manually modified files are eventually updated by another developer because conflicts are detected. I was able to set the reconf_stop_on_fail to false so that it would continue the update process, but those files are never replaced. We are using a remote connection so it can take several hours to resolve all the conflicts automatically using the reconcile command.

In this case, I know that the conflict is normal and would like to know if there was a way to force the update to Get the new file wether there's a conflict or not through in the same update process, rather than having to do a complete reconcile (and forcing to update work area from the database).

Frederic
Report this to a Moderator Report this to a Moderator
Statistics
20925 users are registered to the Telelogic SYNERGY forum.
There are currently 0 users logged in.
The most users ever online was 15 on 15-Jan-2009 at 15:34.
There are currently 0 guests browsing this forum, which makes a total of 0 users using this forum.
You have posted 0 messages to this forum. 0 overall.

FuseTalk Standard Edition v3.2 - © 1999-2009 FuseTalk Inc. All rights reserved.