Updating Source Control Files—Subversion

After you bind a Flare project to Subversion, you can update any of the source control files. When you do this, you are copying the most current files stored in Subversion to your local Flare project.

Following are steps for getting the latest version of all files in a project automatically, as well as steps for getting the latest version of files manually.

[Menu Proxy — Headings — Online — Depth3 ]

Automatic Update

You might use this option if you are working with a team of authors and want to make sure that you include the latest changes from other writers in the output (without having to manually update those files).

With this option:

  • You will not be prompted before the update is performed.
  • Flare will not get the latest copy of the files in the Targets folder, because that would conflict with the generation of the output.
  • Conflicts with files will not cause local files to be overwritten. Therefore, if your local files have been modified, those files will be kept, rather than overwritten with the source control files.

How to Update Source Control Files Automatically

  1. Open the target.
  2. In the Target Editor, select the General tab.
  3. Select the check box labeled Automatically get latest version of all files before generating the target.
  4. Click Save the active file. to save your work.
  5. Build the target.

Note The "automatic get" feature is not supported if you are building output using the command line, as opposed to the Flare interface.

Manual Update

You can manually update all of the files in the Flare project or specific files only.

How to Update Source Control Files Manually

  1. Do one of the following, depending on the part of the user interface you are using:

    • Ribbon Select Source Control > Update (for selected files) or Source Control > Update All (for all files in the project).

    • Right-Click If you have the Content Explorer, Project Organizer, Pending Changes window pane, File List open, right-click the file you want to update and select Source Control > Get Latest Version.
    • Source Control Explorer With the Pending Changes pane open, right-click the file you want to update and select Get Latest Version.

  2. If the local and server files are the same, a message tells you so. Click OK.

    If the local file is different from the file on the server, the Resolve Conflicts dialog opens. If you want to accept all of the differences between the local and server files, thus merging them, click Auto Merge All. If you want to review the differences in the files side by side and resolve each conflict, click Resolve. For more information about merging files and resolving conflicts, see Merging Source Control Files—Subversion.

Note By default, when you open a project that is bound to source control, a message automatically asks if you want to update files. However, you can disable this prompt in the Options dialog (File > Options). See Disabling the Get Latest Prompt for Source Control—Subversion.