Next: , Up: Basic Editing under Version Control   [Contents][Index] Basic Version Control with Merging

On a merging-based version control system (i.e., most modern ones; see Merge-based vs Lock-based Version Control), C-x v v does the following:

These rules also apply when you use RCS in its non-locking mode, except that changes are not automatically merged from the repository. Nothing informs you if another user has committed changes in the same file since you began editing it; when you commit your revision, that other user’s changes are removed (however, they remain in the repository and are thus not irrevocably lost). Therefore, you must verify that the current revision is unchanged before committing your changes. In addition, locking is possible with RCS even in this mode: C-x v v with an unmodified file locks the file, just as it does with RCS in its normal locking mode (see Basic Version Control with Locking).

Next: Basic Version Control with Locking, Up: Basic Editing under Version Control   [Contents][Index]