It's all about the answers!

Ask a question

Finding common ancestor of a file using RTC CLI

Praveen Mohandas (1523) | asked Nov 04 '13, 3:17 p.m.
retagged Dec 16 '13, 4:19 p.m. by David Lafreniere (4.5k7)
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?

Accepted answer

permanent link
Shashikant Padur (4.1k27) | answered Nov 05 '13, 4:11 a.m.
edited Nov 11 '13, 2:08 p.m. by Geoffrey Clemm (29.5k23035)
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

Your answer

Register or to post your answer.