... | @@ -17,35 +17,13 @@ The "Clauses affected" field should reference each attachment that is being chan |
... | @@ -17,35 +17,13 @@ The "Clauses affected" field should reference each attachment that is being chan |
|
|
|
|
|
Changes to attachments should be given in the CR, as a single change block containing a plain diff of the changes to the attachments.
|
|
Changes to attachments should be given in the CR, as a single change block containing a plain diff of the changes to the attachments.
|
|
|
|
|
|
> **EXAMPLE**
|
|
|
|
>
|
|
|
|
> For the change above, the first change block would be the changes to the prose in clause 6.
|
|
|
|
>
|
|
|
|
> **--- SECOND CHANGE (LI-PS-PDU.ASN) ---**
|
|
|
|
>
|
|
|
|
> { changes}
|
|
|
|
>
|
|
|
|
> **--- END OF CHANGES ---**
|
|
|
|
|
|
|
|
The CR author obtains a standard diff file that describes the changes to the attachments. For CR authors using the Forge web UI, this can be done from the Merge Request page.
|
|
The CR author obtains a standard diff file that describes the changes to the attachments. For CR authors using the Forge web UI, this can be done from the Merge Request page.
|
|
|
|
|
|
![image](uploads/483f3b6408bbbc938e46aa5cd1c6242c/image.png)
|
|
![image](uploads/483f3b6408bbbc938e46aa5cd1c6242c/image.png)
|
|
|
|
|
|
The diff file will contain a set of changes to all the attachments affected by the CR. The CR author can then copy and paste the diff into a single change block as shown above.
|
|
The diff file will contain a set of changes to all the attachments affected by the CR. The CR author can then copy and paste the diff into a single change block as shown below.
|
|
|
|
|
|
![image](uploads/0eaee10451dce68d3175b4d82bffb41c/image.png)
|
|
|
|
|
|
|
|
### Showing changes to attachments via track changes
|
|
|
|
|
|
|
|
The CR author can obtain the changes in Word track-changes format by downloading the post-build artefacts from the Merge Request front page.
|
|
|
|
|
|
|
|
![image](uploads/f38c43edd0e06bdcc0ff7cc60d75b9dd/image.png)
|
|
|
|
|
|
|
|
This will download either a single Word document (if only one attachment has been changed) or a zip file containing multiple Word documents (if multiple attachments have been changed).
|
|
|
|
|
|
|
|
The CR author creates a change block for each attachment, and then copy-and-pastes all of the text from the relevant Word document into each change block.
|
|
|
|
|
|
|
|
If this method is used, the CR author **must copy the entire attachment into the change block**, since the absence of line numbers makes any partial change potentially ambiguous. This will make the CR much longer than the equivalent diff format version, which will only contain the sections which have actually changed. For this reason, it is preferred to use the diff format where possible.
|
|
![image](uploads/44393201987c314bb8d4cfc911b97584/image.png)
|
|
|
|
|
|
## Other comments and references to the Forge
|
|
## Other comments and references to the Forge
|
|
|
|
|
... | | ... | |