Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph Introductory paragraph
Whar are Rational Team Concert Patches?
RTC Infocneter for how to create Patches in RTC:
http://pic.dhe.ibm.com/infocenter/clmhelp/v4r0m5/index.jsp?re=1&topic=/com.ibm.team.scm.doc/topics/t_scm_patch.html
Note that this states:
Note: Only ASCII text files can be included in a patch. For information
about changing the properties of a file that is incorrectly classified
as a binary file, see Specifying file properties and line delimiter
types.
I have proceeded as follows:
1. Create an empty model and share it in RTC
2. Add one class, Class1, and create a Patch. Save the Patch on the
file system
3. Delete Class1 from the model, add an Actor an a
UseCase.
4. Save, Check-In, and Deliver the model
5. Now, attempt to Apply the Patch and Auto Resolve.
What is the effect of creating Patches of Rational Software Architect Models?
the UI shows:
"None of these changes could be accepted. You will have to merge them
manually.The Text in brackets should explain why the change could not
be accepted."
The text in brakets states:
"Model1.emx - 29 lines (unable to match context lines)."
So I looked at the patch file in a text editor, and I saw that it
contains a textual diff of the model files.
diff -u -N
MyModelToPatch/Model1.emx
MyModelToPatch/Model1.emx
MyModelToPatch/Model1.emx 2014-04-09 15:02:46.000000053 +0200
+++
MyModelToPatch/Model1.emx 1970-01-01 01:00:00.000000006 +0100
@@ -1,14 +1,29 @@
+
?>
?>
-
?>
RSA Compare and Merge has never worked with Textual Diffs, so I
strongly doubt that it could support working with the RTC Patch
mechanism.
RSA Compare and Merge needs to receive the complete model file (and its
fragments) so that it can compare it with another version of the same.
Heading 1
External links: