Home > Data Modeler Dialog Boxes > Subversion: Merge
A merge operation copies changes made in one branch to another branch, or copies changes from a branch to the trunk (main line of development). It is typically used to bring another developer's work into your own files, and to merge private development back into the main line of development.
The merge is created by comparing the content of two revisions within the Subversion repository, and applying the differences to a Subversion working copy. If you subsequently wish to use the result of the merge in the main line of development, you commit the working copy to the Subversion repository in the usual way.
Specify the following:
Merge Type: Merge Selected Revision Range, Reintegrate a Branch, or Merge Two Different Trees.
Merge Resource
Merge Options
Your selection for Merge Type affects the content of subsequent displays, which can include the following.
From URL and its (start) revision to merge: The resource that is the basis of the comparison. (The resource entered in the To URL box will be compared against the resource entered here.)
HEAD Revision from Repository: Causes the comparison to be made against the most recently committed resources in the Subversion repository.
Use Revision: Causes the comparison to be made against a resource in the Subversion repository with a particular revision number. When selected, the accompanying text box becomes available. You can then enter a revision number into the text box, or click the List Revisions button to select the revision that you require.
To URL and its (end) revision to merge: The resource that will be compared with the base resource selected in the From URL box.
Same as "From" URL: Uses the same base repository location for both elements of the comparison.
Ignore Ancestry: Ignores any relationships between resources in the Subversion repository when comparing the start and end revisions. The effect of this will be to retain resources that have names identical to those they are being compared with, even though the resources have no common ancestry. The alternative is that a resource that predates an identically named one may be deleted and replaced with the later resource.
Dry Run: Causes the comparison to be performed without the changes being applied to the Subversion working copy. The results of the comparison are displayed in the Messages - Log window.
Related Topics