Wiki source code of Version Control
Version 16.1 by Silvia Macovei on 2014/12/04
Hide last authors
| author | version | line-number | content |
|---|---|---|---|
 |
16.1 | 1 | Any change made to a document is saved under Version Control. You can see the version of a document by looking at "History" tab the bottom of the document. For example, on the following document the version is 3.1 and has last been modified by "Administrator". You can also see who last modified the document and the time the change was performed at the top of the page: |
 |
5.3 | 2 | |
| |
12.4 | 3 | {{image reference="versioncontrol1.png"/}} |
| |
1.1 | 4 | |
| |
12.4 | 5 | {{image reference="versioncontrol2.png"/}} |
| |
16.1 | 6 | //"History" as it appears using the Flamingo Skin// |
| |
11.6 | 7 | |
| |
11.9 | 8 | As the image shows, the document version consists of two numbers, separated by a dot: ##<Major>.<Minor>##. The XWiki versioning system allows the distinction between major and minor edits. When [[editing a page>>Features.PageEditing]], the user has the option to decide whether his edit brings major or minor changes to the document. Saving a major version will increase the first component and reset the second to "1", while a minor version will just increase the second component. |
 |
6.1 | 9 | |
| |
9.1 | 10 | Clicking on the "History" button when viewing a page displays all the versions that were previously saved: |
| |
1.1 | 11 | |
| |
9.1 | 12 | Besides listing the document versions, the history page can be used to perform other actions as well: |
| |
1.1 | 13 | |
| |
10.1 | 14 | * compare any two versions |
| |
11.6 | 15 | * set an older version as the current version (rollback); available only if the user has edit rights on the document |
| |
10.1 | 16 | * delete a version completely from the history (useful for removing spam, for example); available only if the user has administration rights |
 |
12.5 | 17 | * delete an entire version range from the history; also available only if the user has administration rights |
| |
10.1 | 18 | |
| |
9.1 | 19 | By default, minor edits do not appear in the document history. The option "Show minor edits" will list all the versions, including minor ones. |
| |
1.1 | 20 | |
| |
11.6 | 21 | Comparing 2 versions highlights the differences between them, grouped by what part of the document they affect: the content, metadata, attachments, comments, objects, class definition. |
| |
1.1 | 22 | |
| |
11.6 | 23 | In order to compare 2 versions you need to select one of the radio buttons corresponding to the version from which you want to start the comparison. These are the buttons located in the "From" column. You will then need to select the button corresponding to the version you want to compare the previously selected version against. These buttons are located in the "To" column. You may choose to include minor edits in the comparison. After selecting the 2 versions you wish to compare you will need to click on "Compare selected versions". Depending on the changes you have made you will get a result similar to this: |
| 24 | |||
| |
12.4 | 25 | {{image reference="versioncontrol3.png"/}} |
| |
16.1 | 26 | //"Changes for document" as they appear using the Flamingo Skin // |
