Go to **Show Log** Screen, select the revision that you want to undo, right click it and select **Revert changes from this revision**, this will do a [reverse-merge][1].


  [1]: http://svnbook.red-bean.com/en/1.8/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo

You may need to use the command line, but you can use the SVN merge command and specify the revisions in reverse to effectively revert a commit.  Assuming your bad commit was r1123, you would do:

    svn merge -r1123:1122 &lt;url of your working copy&gt;


You can revert your working copy to the revision prior to the commit. Once you have reverted your working copy, then simply commit the changes and you will effectively rolled back the accidental commit.

In a case like yours specifically, I would probably check out the revision that I wanted to roll back into a new working copy and then commit the working copy to the head revision.


Recently I wrote a function to generate certain sequences with nontrivial constraints. The problem came with a natural recursive solution. Now it happens that, even for relatively small input, the sequences are several thousands, thus I would prefer to use my algorithm as a generator instead of using it to fill a list with all the sequences.

Here is an example. Suppose we want to compute all the permutations of a string with a recursive function. The following naive algorithm takes an extra argument &#39;storage&#39; and appends a permutation to it whenever it finds one:
&lt;pre&gt;&lt;code&gt;def getPermutations(string, storage, prefix=&quot;&quot;):
   if len(string) == 1:
      storage.append(prefix + string)   # &amp;lt;-----
   else:
      for i in range(len(string)):
         getPermutations(string[:i]+string[i+1:], storage, prefix+string[i])

storage = []
getPermutations(&quot;abcd&quot;, storage)
for permutation in storage: print permutation
&lt;/code&gt;&lt;/pre&gt;
(Please don&#39;t care about inefficiency, this is only an example.)

Now I want to turn my function into a generator, i.e. to yield a permutation instead of appending it to the storage list:
&lt;pre&gt;&lt;code&gt;def getPermutations(string, prefix=&quot;&quot;):
   if len(string) == 1:
      yield prefix + string             # &amp;lt;-----
   else:
      for i in range(len(string)):
         getPermutations(string[:i]+string[i+1:], prefix+string[i])

for permutation in getPermutations(&quot;abcd&quot;):
   print permutation
&lt;/code&gt;&lt;/pre&gt;
This code does *not* work (the function behaves like an empty generator).

Am I missing something?
Is there a way to turn the above recursive algorithm into a generator *without replacing it with an iterative one*?

Python: using a recursive algorithm as a generator

For debugging purposes, I need to recursively search a directory for all files which start with a UTF-8 byte order mark (BOM). My current solution is a simple shell script:

&lt;pre&gt;&lt;code&gt;find -type f |
while read file
do
    if [ &quot;`head -c 3 -- &quot;$file&quot;`&quot; == $&#39;\xef\xbb\xbf&#39; ]
    then
        echo &quot;found BOM in: $file&quot;
    fi
done&lt;/code&gt;&lt;/pre&gt;

Or, if you prefer short, unreadable one-liners:

&lt;pre&gt;&lt;code&gt;find -type f|while read file;do [ &quot;`head -c3 -- &quot;$file&quot;`&quot; == $&#39;\xef\xbb\xbf&#39; ] &amp;&amp; echo &quot;found BOM in: $file&quot;;done&lt;/code&gt;&lt;/pre&gt;

It doesn&#39;t work with filenames that contain a line break,
but such files are not to be expected anyway.

Is there any shorter or more elegant solution?

Are there any interesting text editors or macros for text editors?

Elegant way to search for UTF-8 files with BOM?

I committed a bunch of files (dozens of files in different folders) by accident. What is the easiest, cleanest (and safest!) way to &#39;undo&#39; that commit without having to delete the files from my working directory?


Undoing a commit in TortoiseSVN

<p>I committed a bunch of files (dozens of files in different folders) by accident. What is the easiest, cleanest (and safest!) way to 'undo' that commit without having to delete the files from my working directory?</p>


If you have multiple, unrelated projects, is it a good idea to put them in the same repository?

    myRepo/projectA/trunk
    myRepo/projectA/tags
    myRepo/projectA/branches
    myRepo/projectB/trunk
    myRepo/projectB/tags
    myRepo/projectB/branches

or would you create new repositories for each?

    myRepoA/trunk
    myRepoA/tags
    myRepoA/branches
    myRepoB/trunk
    myRepoB/tags
    myRepoB/branches

What are the pros and cons of each? All that I can currently think of is that you get mixed revision numbers (so what?), and that you can&#39;t use `svn:externals` unless the repository is actually external. (i think?)

The reason I ask is because I&#39;m considering consolidating my multiple repos into one, since my SVN host has started charging per repo.

One SVN repository or many?

Is there any good software that will allow me to search through my SVN respository for code snippets?  I found &#39;FishEye&#39; but the cost is 1,200 and well outside my budget.

SVN Repository Search

How to move a sub directory from one directory to another, given that both are inside the same SVN repository? I am using tortoise SVN.

Move Directory across SVN repository using Tortoise SVN

After considering the answers to my previous question ([One SVN Repository or many?](https://stackoverflow.com/questions/252459/one-svn-repository-or-many)), I&#39;ve decided to take the 4 or so repositories I have and consolidate them into one. This of course leads to the question, **what&#39;s the best way to do this?**

Is there a way to combine two or more repositories maintaining the version history for both?

Edit: *I should also point out that I&#39;m using Assembla.com, which does not provide access to the svnadmin command, AFAIK*

Another edit: *Does this even matter? If svnadmin works on URLs, then it&#39;s no problem then.*

Combining multiple SVN repositories into one

How can I determine current version of my repository to see if I need to upgrade it (svnadmin upgrade)?

In reality I&#39;m hosting SVN with 3rd party and I want to find out if I need to ask them to upgrade my repos or not.

I&#39;m asking since 1.5 server will keep repo version at 1.4, unless I miss something?

How to find out Subversion repository version?

I&#39;ve been reading up on branching/merging with Subversion 1.5 using the excellent and free [Version Control with Subversion][1] book.  I think that I understand how to use the Subversion command line client to perform the actions that I need most often, which are:

**Update Branch with Changes from Trunk**

From the branch&#39;s working directory run: 

&gt; svn merge http://svn.myurl.com/proj/trunk

**Merge Branch into Trunk**

From the trunk&#39;s working directory run:
&gt; svn merge --reintegrate http://svn.myurl.com/proj/branches/mybranch

However, we are using TortoiseSVN 1.5 as our interface to Subversion. I would like to know how best to perform these operations with TortoiseSVN.  The new dialog provides three different options on the main menu. 

1. Merge a range of revisions
1. Reintegrate a branch
1. Merge two different trees

From what I can gather, TortoiseSVN always executes svn with the following syntax.
&gt;svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH

Additionally, reintegrate a branch often fails with a message stating that some targets have not been merged and so it cannot continue, and so I had to use option #3.

My questions are:

1. How do I use TortoiseSVN 1.5 to merge changes from the trunk to a branch?
1. How do I use TortoiseSVN 1.5 to merge the branch to the trunk, with and without the reintegrate method?
1. Which of the above options should I use for each, and why?


----------
**EDIT**

Through &quot;dry run&quot; testing I have found that the command line Subversion operation
&gt; svn merge http://svn.myurl.com/proj/trunk

is analogous to option #1 (Merge a Range of Revisions) in TortoiseSVN, as long as I leave the revision range blank.

  [1]: http://svnbook.red-bean.com/

Using TortoiseSVN how do I merge changes from the trunk to a branch and vice versa?

Using TortoiseSVN, I need to take changes I&#39;ve done in a branch and then merge them with trunk.  

I am the only developer on this project, so I know trunk hasn&#39;t changed.  I am learning SVN so that eventually my team can use it.

Basically, I want my trunk to look exactly like the branch.

In pre-svn world, I would just copy the files in my branch folder, delete the files in the trunk folder, and then copy branch into trunk.

In TortoiseSVN, I&#39;ve tried `Reintegrate a branch`, `Merge a range of revisions`, and `Merge two different trees`.  Nothing seems to actually change trunk.  I&#39;ve also tried branching on top of the trunk.  This gives me an error, saying that the trunk already exists.

Merge branch with trunk

Using TortoiseSVN - when I use Test Merge, I get the error &quot;http://mysvnserver/svn/main/branches/ProjectA must be ancestrally related to http://mysvnserver/svn/main/trunk/ProjectB&quot;

What can I do to resolve this?

SVN - Reintegration Merge error: &quot;must be ancestrally related&quot;

I deleted a file from a repo and now want to put it back. The best I can figure out is to:

- update to the revision before the delete
- copy the files elsewhere
- update to head
- copy the files back
- add them
- commit

That just smells bad and it looses all history to boot. There has got to be a better way to do this. I have already looked in [The SVN Book][1] but didn&#39;t find anything and am now looking down the SVN tag list.


  [1]: http://svnbook.red-bean.com/

What is the correct way to restore a deleted file from SVN?

I mistakenly added files to Git using the command:

    git add myfile.txt

I have not yet run `git commit`. Is there a way to undo this, so these files won&#39;t be included in the commit?



How do I undo &#39;git add&#39; before commit?

After the last commit, I modified a bunch of files in my working copy, but I want to undo the changes to one of those files, as in reset it to the same state as the most recent commit.

However, I only want to undo the working copy changes of just that one file alone, nothing else with it.

How do I do that?


Undo working copy modifications of one file in Git?

I accidentally **committed the wrong files** to [Git][1] but didn&#39;t push the commit to the server yet.

How can I **undo those commits from the local repository**?

The only way seems to be to copy the edits in some kind of GUI text editor, then wipe the whole local clone, then re-clone the repository, then re-applying the edits. However,
 - This can cause data loss.
 - It&#39;s very hard to do this when only an accidental `git commit` was run.

Is there a better way?

  [1]: https://en.wikipedia.org/wiki/Git

How do I undo the most recent local commits in Git?

While coding I added print statements into some files to keep track of what was going on.

When I am done, is it possible to revert changes in some files, but commit the file I actually worked on? 

Say I added print in file `A`, but I modified file `B`. `B` is what I want to commit and `A`, I want to be set back to its old state.


Git undo changes in some files

[This answer](https://stackoverflow.com/questions/1088387/what-specific-productivity-gains-does-vim-emacs-provide-over-gui-text-editors/1088705#1088705) says:

&gt; Vim&#39;s undo/redo system is unbeatable. Type something, undo, type something else, and you can still get back the first thing you typed because Vim uses an undo tree rather than a stack. In almost every other program, the history of the first thing you typed is lost in this circumstance.

This is the first I hear of this. How can I backtrack along the tree?


Content Type	Original Author	Original Content on Stackoverflow
Question	Manu	View Question on Stackoverflow
Solution 1 - Svn	Christian C. Salvadó	View Answer on Stackoverflow
Solution 2 - Svn	jcoby	View Answer on Stackoverflow
Solution 3 - Svn	Noah Goodrich	View Answer on Stackoverflow

Undoing a commit in TortoiseSVN

Svn Problem Overview

Svn Solutions

Solution 1 - Svn

Solution 2 - Svn

Solution 3 - Svn

Elegant way to search for UTF-8 files with BOM?

Python: using a recursive algorithm as a generator

Attributions