Merge a change set with a gap in its history
- To backport a fix that is associated with task 6, open
the work item and click the Links tab.
- Select the change set that was created by Evan; right-click
and click Accept.
- The fix depends on other changes that were made in the
4.0 stream, so the change set cannot be accepted because there is
a gap in its history. In the Continue Accept window,
In the Gap editor, the Changes to Merge section
shows the changes from the source change set that need to be merged
into the resulting change set. The Resulting Change Set section
shows the new resulting change set.
In the Changes to Merge section,
the change set that is being backported contains two file changes,
both of which have a gap in their history.
- The SubcommandLauncher.java file has two
change details, a content change and an encoding change, both of which
can be resolved automatically. The changes for the file are marked
as done in the Changes to Merge section and a corresponding change
is checked in to the resulting change set.
- The DaemonStartCmdTest.java file has only
a content change, but this change cannot be resolved automatically,
so there is no corresponding change in the resulting change set yet.
The next section describes how to manually resolve this change.
Tip: To show only the remaining changes to merge,
in the Changes to Merge section, in the upper
right, click the Filter icon; then select the Show
merges marked as done check box. To view only unmerged
changes, clear the check box.