Finding common ancestor of a file using RTC CLI

Praveen Mohandas

Dec 16 '13, 4:19 p.m.

Without bringing RTC Eclipse client into the picture, I would like to invoke an external merge tool (kdiff3) to resolve conflicting merges when accepting incoming changes into an RTC repository workspace. To get a local copy of the file in the incoming changeset, I plan to use scm changeset extract. How would I get the common ancestor version?

0 votes

1 answer

5,877 views

0 votes

Accepted answer

Permanent link

Shashikant Padur

JAZZ DEVELOPER (4.3k●2●7) edited

Nov 11 '13, 2:08 p.m.

When you have a conflict, you should be able to get the ancestor using 'scm conflicts --ancestor {filepath} --content' or just 'scm conflicts --ancestor {filepath}' depending on which version of RTC you are using. For now it will display on the console but you can pipe the output to a file.

Praveen Mohandas selected this answer as the correct answer

1 vote

Your answer

Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.

Follow this question

By Email:

Once you sign in you will be able to subscribe for any updates here.

By RSS:

Answers

Answers and Comments

Question details

rational-team-concert

× 42,896

usage

× 12,019

scm

× 1,202

× 889

× 158

× 113

× 87

× 5

Question asked: Nov 04 '13, 3:17 p.m.

Question was seen: 5,877 times

Last updated: Dec 16 '13, 4:19 p.m.

Finding common ancestor of a file using RTC CLI

Praveen Mohandas

1 answer

5,877 views

0 votes

Accepted answer

Shashikant Padur

Your answer

Follow this question

Question details

Related questions