Dubious "svn merge" output

The official documentation of the Subversion version control system

Brought to you by: cmpilato, danielshahaf

#228 Dubious "svn merge" output

Milestone: en-1.8

Status: Fixed

Owner: nobody

Labels: None

Priority: Medium

Type: Defect

Updated: 2015-02-23

Created: 2015-02-14

Creator: Anonymous

Private: No

Originally created by: gan.ainm...@gmail.com

In subsection "Vendor Branches from Mirrored Sources" of the chapter "Branching and Merging", the command output of "svn merge ^/vendor/libcomplex-1.0.0 ^/vendor/libcomplex-1.0.1" contains the line "--- Merging differences between URLs into '.':", i.e., a message not stating the type of URL, however, a scan of the complete source tree of Subversion 1.8 only shows occurrences of either "...repository URLs..." or "...foreign repository URLs..."

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 - 2015-02-14

Originally posted by: cmpilato

I believe you're correct.

Labels: Milestone-en-1.6

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) I believe you're correct. **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 - 2015-02-15

Originally posted by: gan.ainm...@gmail.com

Why milestone 1.6? I was referring to the 1.8 book.

*Originally posted by:* [gan.ainm...@gmail.com](http://code.google.com/u/108424625290860045971/) Why milestone 1.6? I was referring to the 1.8 book.

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 - 2015-02-16

Originally posted by: cmpilato

I set the milestone to the oldest currently-maintained version that exhibits the problem as a reminder to myself of how far to go with backporting the fix.

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) I set the milestone to the oldest currently-maintained version that exhibits the problem as a reminder to myself of how far to go with backporting the fix.

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 - 2015-02-23

Originally posted by: cmpilato

Sending trunk/en/book/ch04-branching-and-merging.xml
Transmitting file data .
Committed [r5000].

Status: Fixed

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) Sending        trunk/en/book/ch04-branching-and-merging.xml Transmitting file data . Committed [r5000]. **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:

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 - 2015-02-23

Originally posted by: cmpilato

(No comment was entered for this change.)

Labels: -Milestone-en-1.6 Milestone-en-1.8

*Originally posted by:* [cmpilato](http://code.google.com/u/cmpilato/) *\(No comment was entered for this change.\)* **Labels:** -Milestone-en-1.6 Milestone-en-1.8

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.