ch02: Minor technical inconsistency in describing conflicted files

The official documentation of the Subversion version control system

Brought to you by: cmpilato, danielshahaf

#42 ch02: Minor technical inconsistency in describing conflicted files

Milestone: en-1.6

Status: Fixed

Owner: nobody

Labels: None

Priority: Medium

Type: Defect

Updated: 2011-07-15

Created: 2009-03-31

Creator: Anonymous

Private: No

Originally created by: quinntay...@mac.com
Originally owned by: cmpilato

trunk/src/en/book/ch02-basic-usage.xml

Lines 1383-1386

When describing the unversioned files generated when conflicts occur, the manual states that
"NEWREV is the revision number of the repository HEAD". Strictly speaking, NEWREV is not
necessarily HEAD, but the revision being updated to. For example, if the user supplies the -r option
to update to a specific revison, NEWREV may be less than HEAD. Without overburdening the reader
in chapter 2, think there must be a way to describe this in a technically correct way.

Discussion

Comment has been marked as spam.
Undo

View and moderate all "tickets Discussion" comments posted by this user

Mark all as spam, and block user from posting to "Tickets"

Anonymous - 2011-06-28

Originally posted by: cmpilato

(No comment was entered for this change.)

Owner: cmpilato

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) *\(No comment was entered for this change.\)* **Owner:** cmpilato

Add attachments
Cancel
You seem to have CSS turned off. Please don't fill out this field.

You seem to have CSS turned off. Please don't fill out this field.

New Attachment:

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Comment has been marked as spam.
Undo

View and moderate all "tickets Discussion" comments posted by this user

Mark all as spam, and block user from posting to "Tickets"

Anonymous - 2011-07-06

Originally posted by: cmpilato

(No comment was entered for this change.)

Summary: ch02: Minor technical inconsistency in describing conflicted files
Labels: Milestone-en-1.6

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) *\(No comment was entered for this change.\)* **Summary:** ch02: Minor technical inconsistency in describing conflicted files **Labels:** Milestone-en-1.6

Add attachments
Cancel
You seem to have CSS turned off. Please don't fill out this field.

You seem to have CSS turned off. Please don't fill out this field.

New Attachment:

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Comment has been marked as spam.
Undo

View and moderate all "tickets Discussion" comments posted by this user

Mark all as spam, and block user from posting to "Tickets"

Anonymous - 2011-07-15

Originally posted by: cmpilato

FIXED in [r3911].

Status: Fixed

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) FIXED in [r3911]. **Status:** Fixed

Add attachments
Cancel
You seem to have CSS turned off. Please don't fill out this field.

You seem to have CSS turned off. Please don't fill out this field.

New Attachment:

If you would like to refer to this comment somewhere else in this project, copy and paste the following link:

Log in to post a comment.