It's all about the answers!

Ask a question

Potential conflicts in RTC Eclipse client


Rakesh A (3110) | asked Nov 24 '20, 11:32 p.m.
edited Nov 25 '20, 2:01 a.m.
Hello,
     I was going through the jazz link and I have clarification with one of the behavior regarding potential conflicts.

As mentioned in below link : When Rational Team Concert source control detects that the same file exists in an outgoing change set and an incoming change set, it recognizes that a potential conflict exists and places orange icon beside the Outgoing and Incoming folders that include the conflict.


I have tried a small example in context of baseline (having same file changed):

StreamA -- Component (abc.txt)-- version 1
StreamA -- Component (abc.txt)-- version 2
I created a Repository : RWS_StreamA -- Component (abc.txt)-- version 2
Now , In Repository I have changed the file abc.txt and baselined.
Repository : RWS_StreamA -- Component (abc.txt)-- version 3
Then I replace baseline in stream :StreamA -- Component (abc.txt)-- version 1

By doing above steps, I don't see any potential conflicts in Repository.
Let me know what I should actually do to get potential conflicts ?
At what instance potential conflicts comes for baseline ?


One answer



permanent link
Ralph Schoon (59.0k23642) | answered Nov 25 '20, 2:21 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
edited Nov 25 '20, 2:22 a.m.
The description is not detailed enough. If you want to see a conflict, do the following:
Stream with Component and file test.txt.

Create repository workspaces RWS1 and RWS2 from the stream.
In Eclipse client 1 with Eclipse workspace ews1, load RWS1
In Eclipse client 2 with Eclipse workspace ews2, load RWS2
In Eclipse client 1 change test.txt in line 1, deliver the change
In Eclipse client 2 change test.txt in line 1, check the pending changes view for conflicts.

Comments
Rakesh A commented Nov 25 '20, 3:15 a.m.
Sure.. In Which scenario I can see potential conflicts on baseline ?

Ralph Schoon commented Nov 25 '20, 3:34 a.m. | edited Nov 25 '20, 3:35 a.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
A baseline is a consistent set of files in a specific state. A baseline has no conflicts. You can only have conflicts if you compare two different configurations that have a common ancestor but have been developed independently.

Start with repository workspace RWS and stream S, have a component and a file test.txt in there. Create Baseline B1 for the stream.
Change test.txt in the first line. Deliver to S. Create Baseline B2.
Rebase S and RWS to B1
Change test.txt in the first line in another way. Deliver to S. Create Baseline B3.
Rebase S to B2

The pending changes shows a conflict between S and RWS.

Your answer


Register or to post your answer.