StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p><a href="https://stackoverflow.com/a/4963234/14955">Answer is outdated</a>, now that we have <code>svn log -g</code>.</p> <hr> <p>No, you are not crazy. That is how it works, unfortunately.</p> <p>The best you could do is include in the commit message for the merge the branch url and revision number, so that one could manually look up the revision log for that branch. (The data is still there, of course).</p> <p>However, you don't know which of the changes have made it into the trunk, and which have not.</p> <p>If there have been no or few changes on the trunk, it might be an option to do a reverse-merge (merge from trunk into branch) and then replace the trunk with the branch. This kind of reasoning can also be done on individual subfolders (for example: replace the XML parser implementation subfolder from the branch, keep the rest). Replacing folders (with svn delete, svn copy) will keep the revision history.</p> <p>For files that were newly added during the merge, their revision history can be copied over from the branch, if you used the svn copy command. Not sure if the merge command includes support for this, though.</p> <p>It might be interesting to know if there is a tool for svn that does a "rebase" (as in git or mercurial). That would create individual commits for every change on the branch. On the other hand, maybe individual commits are too much clutter.</p> <p>Best recommendation I can give is to use a good UI, such as Trac, that makes it easy to inspect the revision history, so you can look at what happened on the branch.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload