Originally created by: cmpilato
Originally owned by: ptbu...@gmail.com
User Chris Jonck <chris.johnk@gmail.com> notes the following in mail sent to svnbook-dev@:
{{{
In the svn 1.4 version of the book, the documentation of the merge
command includes an example of merging trunk changes into a branch to
keep the branch current with mainline development:
svn merge -r 23:30 file:///tmp/repos/trunk/vendors
This is an incredibly useful example, as it clarifies that when doing
this sort of merge, you want to specify the range of revisions on
trunk whose changes you wish to merge.
}}}
After some questioning, it was revealed that Chris' repository's trunk had "a long, complicated revision history before the branch was even created." While merge tracking should have alleviated Chris' need for this sort of explicit-revision-range merge, 'svn merge' without a revision range was, for some reason, trying to merge revisions from way too far back in history -- pre-branch-creation.
I suspect that there is some good explanation for the problems Chris saw that is related to that complicated history he refers too. But regardless, there is some value to the idea that we might wish the book to explicitly state the pre-merge-tracking way of doing these merges, if only because sometimes reality isn't as pretty as theory.
View and moderate all "tickets Discussion" comments posted by this user
Mark all as spam, and block user from posting to "Tickets"
Originally posted by: cmpilato
(No comment was entered for this change.)
Owner: pbu...@googlemail.com
View and moderate all "tickets Discussion" comments posted by this user
Mark all as spam, and block user from posting to "Tickets"
Originally posted by: cmpilato
(No comment was entered for this change.)
Summary: ch04: Consider re-adding pre-merge-tracking examples
View and moderate all "tickets Discussion" comments posted by this user
Mark all as spam, and block user from posting to "Tickets"
Originally posted by: cmpilato
Oops. Use the correct address for Paul Burba.
Owner: ptbu...@gmail.com
View and moderate all "tickets Discussion" comments posted by this user
Mark all as spam, and block user from posting to "Tickets"
Originally posted by: cmpilato
Punting to 1.7.
Labels: -Milestone-en-1.6 Milestone-en-1.7
View and moderate all "tickets Discussion" comments posted by this user
Mark all as spam, and block user from posting to "Tickets"
Originally posted by: cmpilato
Bumping these out of the 1.7 milestone, not because I don't want to attack them in that timeframe, but because they don't necessarily block the completion of the 1.7 doc task.
Labels: Milestone-whenever
View and moderate all "tickets Discussion" comments posted by this user
Mark all as spam, and block user from posting to "Tickets"
Originally posted by: ptbu...@gmail.com
Added a sidebar describing pre-mergetracking merges in [r4185].
Status: Done