User Tools

Site Tools


incoming_vs_outgoing_changes

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

incoming_vs_outgoing_changes [2013/07/25 21:00]
127.0.0.1 external edit
incoming_vs_outgoing_changes [2013/07/30 07:33] (current)
admin Update according to new features in Lure V3
Line 30: Line 30:
  
  
-Whenever outgoing changes are detected during an Import, or incoming changes are detected during an Export, Lure will keep these changes intact. However, because the database will end up being different from the source code on the file system, Lure will create a file containing the current source extracted from the database. It will create this file in the same directory as the main source file and it will have the same name as the main source file except with the text “.###​database###​” appended at the end.+Whenever outgoing changes are detected during an Import, or incoming changes are detected during an Export, Lure will keep these changes intact.
  
 **Example:​** **Example:​**
  
-Consider the following outcome of an export operation, where the package ​JOB_INFO contained ​incoming changes:+Consider the following outcome of an export operation, where the package ​PACKAGE_2 contains ​incoming changes ​(as indicated by the icon decoration):
  
-<box 864px round> +{{ :incoming-change.png?​nolink ​|}}
-{{:conflictfile.jpg?nolink&}} +
-</​box|>​+
  
  
 +The incoming change in package PACKAGE_2 was kept during export.
  
-The incoming change was kept in the package JOB_INFO and as a result ​Lure saved the database source code to the file system.+You can use the Lure Stage comparison editor ​to review any such remaining differences after an import/​export operation. From the context menu select ''​Compare With''​ -> ''​Database...''​
  
-You can now use a source file comparison tool like WinMerge to compare the database version with the source on the file system. You can do this by selecting both the source file and the database version of the same file and then by opening WinMerge from the context menu in Windows Explorer. (See below.) 
  
 +{{ :​incoming-change-compare.png?​nolink |}}
  
-  
-<box 573px round> 
-{{:​winMerge.jpg?​nolink&​}} 
-</​box|>​ 
  
 +At this point you could then merge any changes from the ''​Database Source''​ to ''​File Source''​ and save these changes. If necessary use Import to install these merged changes back to the database. You may need to use ''​Import Over''​ if there are any remaining outgoing changes that you want to overwrite.
  
-At this point you could then merge any changes from the database version to the source file version and save these changes. If necessary use Import to install these merged changes back to the database. You may need to use %%''​import --over''​%% if there are any remaining outgoing changes that you want to overwrite. 
  
-Lure will automatically delete the database version of the source file whenever your next action (Import or Export) resolves the difference between the database and the source file. 
incoming_vs_outgoing_changes.txt · Last modified: 2013/07/30 07:33 by admin

Page Tools