Node: Merging into working files, Next: , Previous: Comparing versions, Up: Basic Use



Merging into working files

After modifying the working files created by checking out the then-latest version of P1 (1.15, let us say), you may try to check them back in and discover that other minor versions of P1 version 1 have been added since 1.15 (prcs checkin will tell you this, and prcs diff or prcs merge -n will give details).

One way to deal with these differences is to merge the contents of your working files with the new version in the repository:

     % prcs merge P1
     

By default, the checked-in version used by this command is the latest minor revision of the major revision of P1 indicated in your working .prj file (for this example, let's say version 1.17). The command prcs merge will prompt you for what action you want to take in cases where there are changes between the latest version and the version from which you checked out the working files.

The merge does not create and check in a new version; it merely updates your working files. It will also update your P1.prj file to indicate that it came from the version specified--implicitly or explicitly--by the merge subcommand, and you may perform a check-in as a new version.