StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>Brute force way:</p> <ol> <li>Make a copy of your local files.</li> <li>Delete all the .svn files in all the directories</li> <li>Check out the the HEAD version.</li> <li>Copy your local files onto the checked out HEAD.</li> <li>Check your local files back into the repository.</li> </ol> <p>If you did it correctly, the SVN client should interpret the changed files as updates to the repository. This will however overwrite any changes other people have made that you may want to keep. If you want to keep those changes, do a diff on all the files first and incorporate all the recent changes, before making the final commit.</p> <p>Reverse merge back to original revision:</p> <ul> <li>For each changed file, <ol> <li>Compare diff, note changes you want to keep, and change your local copy accordingly. </li> <li>Make a copy of your local files.</li> <li>Reverse merge HEAD back to desired original version.</li> <li>Paste your copy of the local files onto the merged local copy. (Delete .svn first)</li> <li>Commit</li> </ol></li> </ul> <p>This is probably more manual unless you just revert everything back without checking for any changes. </p> <p>Subversion, AFAIK, has no provision for an obliterate command yet, so all changes always happen to the local copy of the HEAD. </p> <p>Reverting back is just a reverse merge, and all merges always happen on your local copy. In an ideal system, the merge will be tracked, but Subversion doesn't track merge information, so you might as well do method 1, and just make a comment in the commit log.</p> <p>Some URLs to look up:</p> <ul> <li><a href="http://www.nabble.com/Newb-help-moving-to-older-revision-of-file-td14936921.html" rel="noreferrer">Nabble - Subversion Users - Newb help moving to older revision of file</a></li> <li><a href="http://svnbook.red-bean.com/en/1.0/ch04s03.html" rel="noreferrer">Copying Changes Between Branches</a></li> <li><a href="http://svnbook.red-bean.com/en/1.0/ch04s04.html" rel="noreferrer">Common Use-Cases for Merging</a></li> </ul>

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