Import dialog box

 

 

The Import Dialog Box currently let you only import Unix patches.

Patches can be applied in these situations:

• on file based documents (texts, images...): the patch import will apply the first item of the patch, if the patch contains several items.
• or on collection documents (folders): the patch import will try to apply each individual item, based on the path stored in each item header if any (it means that Context or Unified format are required for a useful result here). In this case the field Number of path steps to remove from source path start, let you tell how many steps must be ignored from the source path when composing it to the root of source side, the target is always the counterpart of the source file in the target side (through the differentiation tree). For example: c:\dev\path\file.txt, composed with c:\branch\1.1 using a value of 2 gives: c:\branch\1.1\path\file.txt, letting you apply a patch built from your current development tree under the branch 1.1. You can use the Test button, to check if this parameter is well set.
  If you select Mark all patched items, a mark will be set on all the patch items, this way you can use the Select Bookmarked Items / Write result combination to validate the patch application if you decided to use the preview mode.

 

• on simple editors in this case the patch application is necessarily 'in-place' (i.e. writing the result of the patch over the source)
• or in differentiation/merge views, in this case you can choose with the Source and Target fields where to read data and then where to write them ultimately

 

• at once, in this case the patch is written to the destination potentially asking if removal is wanted or not (for deletion patch items), following the Patching may remove target files option.
• after a test, the Test button let you try the patch application. It will output in the log window the correctness of the application of the various patch items
• or in a preview, when Open in a preview is checked, a new view using the current view settings and always following a basic 2-way differentiation disposition where the left side is the source to which the patch was applied, and the right side is the result of the application of the patch (additional, the output location is either set to the left side for in-place application, or to the result side which is initialised to the ultimate target of the patch application). As the application is saved in a temporary place, it is always safe to check the patch this way before writing the final result. It is a great way to simply review a patch before sending it to your colleagues.

Whichever the situation the following fields let you parameter the import:

• Patch file / Import from clipboard: let you specify from where to read the patch file
• Reversed: When automatic mode is selected, the left patch side will be used in priority if it matches the source file, else the right is used if it matches. The patch right side will be used if Yes is used. The pathc left side will be normally used if No is selected.
• Allow to reduce context by # lines:  when activated, this option lets the application engine reduce the number of lines of context which are necessary to accept match. Increasing this number increases also the risk of wrong matches, but reduces the number of matches rejected because of changes around the patched areas
• Allow max lines moves of # lines: when activated, this option lets the application engine try to find the patched lines at position near the original position in the source file
• Allow partial patch application: if not checked, Ellié Computing Merge will apply a patch only if all the patched areas can be in a file. However it is sometime useful to see exactly what does apply and what does not, by checking this and then taking care of the rejections data that Ellié Computing Merge saves.
• Store rejections for each file aside the [Source|Target], Extension: rej :  These settings let you mark where rejections are saved when file level patch items are rejected (partially or completely). This field is available only when apply a patch to a collection document.
• Put remaining rejected patch elements into clipboard: when activated, if some patch elements were rejected, the rejected parts of the patches are stored in the clipboard.