My easy click-by-click instructions (**specific to TortoiseSVN**) are in Stack&amp;nbsp;Overflow question *[What is the simplest way to do branching and merging using TortoiseSVN?][1]*.

  [1]: https://stackoverflow.com/questions/1461922


[Version Control with Subversion][1]

A very good resource for source control in general. Not really TortoiseSVN specific, though.


  [1]: http://svnbook.red-bean.com/

You can also try *[Version Control for the Standalone Programmer - Part 1][1]* or perhaps *[Merging with TortoiseSVN][2]*.

  [1]: http://www.codeproject.com/KB/work/XTortoiseSVN.aspx
  [2]: http://www.kenegozi.com/Blog/2007/07/30/merging-with-tortoisesvn.aspx


How would I go about generating a list of all possible permutations of a string between x and y characters in length, containing a variable list of characters.

Any language would work, but it should be portable.

Generate list of all possible permutations of a string

I am using apple M1 MacBook pro.

When I installed oh my zsh. When I added`export PATH=&quot;/opt/homebrew/bin:$PATH&quot;` to my ~/.zshrc file. This error was shown in my terminal:

```
joe :: share/zsh/site-functions &#187; source ~/.zshrc
compinit:503: no such file or directory: /usr/local/share/zsh/site-functions/_brew
compinit:503: no such file or directory: /usr/local/share/zsh/site-functions/_brew_cask
```

However, I checked and found that these two files do exsist.
Can someone tell me that the problem is?

This is my ~/.zshrc file:

```
Last login: Sat Jan 16 14:53:34 on console
compinit:503: no such file or directory: /usr/local/share/zsh/site-functions/_brew
compinit:503: no such file or directory: /usr/local/share/zsh/site-functions/_brew_cask
[oh-my-zsh] Random theme &#39;jnrowe&#39; loaded
Ξ ~ → cd ~
Ξ ~ → source .zshrc

compinit:503: no such file or directory: /usr/local/share/zsh/site-functions/_brew
compinit:503: no such file or directory: /usr/local/share/zsh/site-functions/_brew_cask
# export MANPATH=&quot;/usr/local/man:$MANPATH&quot;
[oh-my-zsh] Random theme &#39;cypher&#39; loaded
joe :: ~ &#187; chmod 755 /usr/local/share/zsh
chmod 755 /usr/local/share/zsh/site-functions

joe :: ~ &#187; sudo chmod 755 /usr/local/share/zsh
Password:
joe :: ~ &#187; sudo chmod 755 /usr/local/share/zsh/site-functions
joe :: ~ &#187; ls
#ZSH_DISABLE_COMPFIX=true

# If you come from bash you might have to change your $PATH.
# export PATH=$HOME/bin:/usr/local/bin:$PATH

#Homebrew
export PATH=&quot;/opt/homebrew/bin:$PATH&quot;
export PATH=&quot;/opt/homebrew/sbin:$PATH&quot;
#Homebrew END

#Wget
export LDFLAGS=&quot;-L/opt/homebrew/opt/openssl@1.1/lib&quot;
export CPPFLAGS=&quot;-I/opt/homebrew/opt/openssl@1.1/include&quot;
#Wget END

 #Path to your oh-my-zsh installation.
export ZSH=&quot;/Users/caizhuoyue/.oh-my-zsh&quot;

# Set name of the theme to load --- if set to &quot;random&quot;, it will
# load a random theme each time oh-my-zsh is loaded, in which case,
# to know which specific one was loaded, run: echo $RANDOM_THEME
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
ZSH_THEME=&quot;random&quot;

&quot;~/.zshrc&quot; 114L, 3999C






zsh problem: compinit:503: no such file or directory: /usr/local/share/zsh/site-functions/_brew

How do you [branch and merge][1] with Apache Subversion using the TortoiseSVN client? 

  [1]: http://svnbook.red-bean.com/en/1.8/svn.branchmerge.html

How do you branch and merge with TortoiseSVN?

<p>How do you <a href="http://svnbook.red-bean.com/en/1.8/svn.branchmerge.html" target="_blank" rel="noopener noreferrer">branch and merge</a> with Apache Subversion using the TortoiseSVN client?</p>


I&#39;ve been using [TortoiseSVN ][1] in a Windows environment for quite some time.  It seems very feature-complete and nicely integrated into the Windows shell, and more importantly, it&#39;s fairly painless to teach to colleagues with little or no experience with source control.  **However**, since we have moved to Windows Vista 64bit, Tortoise has been very buggy and has seemed to cause lots of explorer.exe abnormalities and crashes.  This has happened both with older versions of the software and the latest version (1.5.1 build 13563).

I was curious if anyone has suggestions for other Subversion clients that will run on Windows (specifically Vista 64bit).  Developers here use a variety of text editors so using Visual Studio or Dreamweaver for SVN is not ideal.

I have heard great things about [Cornerstone][2], and would love something similar for Windows if it exists.


  [1]: https://web.archive.org/web/20200229173754/http://tortoisesvn.tigris.org/
  [2]: http://www.zennaware.com/cornerstone/

---

I&#39;m correlating the Vista/explorer problems with Tortoise because they normally occur when I&#39;m using the functionality in Tortoise.  Sometimes bringing up the &quot;merge&quot; screen will cause the GUI to start acting very strange and eventually hang or crash.

I did not see 1.5.2 -- I&#39;m installing now, maybe that will fix some of my issues.

Best Subversion clients for Windows Vista (64bit)

Stack Overflow has a subversion version number at the bottom:

&gt; svn revision: 679

I want to use such automatic versioning with my `.NET Web Site/Application`, Windows Forms, WPD projects/solutions.

 How do I implement this?

How do I sync the SVN revision number with my ASP.NET web site?

I want to get my databases under version control. 

I&#39;ll always want to have at least *some* data in there (as [alumb][1] mentions: user types and administrators). I&#39;ll also often want a large collection of generated test data for performance measurements.

How would I apply version control to my database?


  [1]: https://stackoverflow.com/users/80/alumb

How to do version control for SQL Server database?

I&#39;ve been using [Subversion][1] for a few years and after using [SourceSafe][2], I just love Subversion.  Combined with [TortoiseSVN][3], I can&#39;t really imagine how it could be any better.  

Yet there&#39;s a growing number of developers claiming that Subversion has problems and that we should be moving to the new breed of distributed version control systems, such as [Git][4].  

How does Git improve upon Subversion?

  [1]: http://en.wikipedia.org/wiki/Apache_Subversion
  [2]: http://en.wikipedia.org/wiki/Microsoft_Visual_SourceSafe
  [3]: http://en.wikipedia.org/wiki/TortoiseSVN
  [4]: http://git.or.cz/ &quot;Git Distributed Version Control System&quot;


Why is Git better than Subversion?

My company is using CVS as our de-facto standard for source control. However, I&#39;ve heard a lot of people say that SVN is better.

I know SVN is newer, but other than that, I&#39;m unfamiliar with its benefits.

What I&#39;m looking for is a good, succinct comparison of the two systems, noting any advantages or disadvantages of each in a Java/Eclipse development environment.

What are the advantages of using SVN over CVS?

I&#39;ve moved from TFS to SVN (TortoiseSVN) with my current company. I really miss the &quot;Shelve&quot; feature of TFS. I&#39;ve read various articles on how to &quot;Shelve&quot; with SVN, but I&#39;ve read nothing that gives a very simple experience to &quot;shelve&quot; work.

Ideally, I&#39;d like extra items added to the TortoiseSVN context menu - &quot;Shelve&quot; &amp; &quot;Unshelve&quot;.
&quot;Shelve&quot; would remove the current shelve-set, and upload the working directory under a suitable path defined by user options. &quot;Unshelve&quot; would merge the set with the working copy.

Does something like this exist? Can anyone suggest any ways to &quot;hack&quot; this feature in the GUI?

Note: The following link doesn&#39;t really achieve the user experience I was looking for:

[Shelving Subversion][2]

One of the greatest things about TFS Shelve is how easy it is to use...


  [1]: http://geekswithblogs.net/flanakin/archive/2005/12/02/61929.aspx
  [2]: http://mikemason.ca/2005/03/30/

Shelve in TortoiseSVN?

I just saw a really cool WPF twitter client that I think is developed by the Herding Code podcast guys [HerdingCode][1] called [Witty][2].  (or at least, I see a lot of those guys using this client).  This project is currently posted up on Google Code.

Many of the projects on Google Code use Subversion as the version control system (including Witty).  Having never used Subversion, I&#39;m not sure what to do to download the code.  

On the source page for this project ([google code witty source][3]) it gives the following instruction:

**Non-members may check out a read-only working copy anonymously over HTTP.** &lt;br&gt;
***svn checkout http://wittytwitter.googlecode.com/svn/trunk/ wittytwitter-read-only*** 

I&#39;m confused as to where I am supposed to enter the above command so that I can download the code.

I have installed SVN and Tortoise (which I know almost nothing about).  

Thanks for any help or simply pointing me in the right direction.

...Ed (@emcpadden)


  [1]: http://www.herdingcode.com/
  [2]: http://code.google.com/p/wittytwitter/
  [3]: http://code.google.com/p/wittytwitter/source/checkout

How do I download code using SVN/Tortoise from Google Code?

I&#39;m using TortoiseSVN against the SourceForge SVN repository. I&#39;d like to move a file from one folder to another in order to maintain its revision history. Is this possible? If so, how do you do it?

(My current strategy has been to copy the file into the new folder and check it in and then delete the file from the current folder.)

How do you move a file?

Is there a good external merge tool for tortoisesvn (I don&#39;t particularly like the built in Merge tool).  I use WinMerge for diffs, but it doesn&#39;t work with the three way merge (maybe a better question would be is there a way to force tortoisesvn to merge like tortoisecvs?)

[Edit]

After trying all of them, for me, the SourceGear is the one I prefer.  The way to specify the DiffMerge from sourcegear is:

&gt; C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe  /t1=&quot;My Working Version&quot; /t2=&quot;Repository Version&quot; /t3=&quot;Base&quot; /r=%merged %mine %theirs %base

Better Merge Tool for Subversion

I would like to move a file or folder from one place to another within the same repository without having to use Repo Browser to do it, and without creating two independent add/delete operations.  Using Repo Browser works fine except that your code will be hanging in a broken state until you get any supporting changes checked in afterwards (like the .csproj file for example).

Update: People have suggested &quot;move&quot; from the command line. Is there a TortoiseSVN equivalent?

How do I move a file (or folder) from one folder to another in TortoiseSVN?

How do I create a branch?

I&#39;ve seen these words a lot around Subversion (and I guess general repository) discussions.  
I have been using **SVN** for my projects for the last few years, but I&#39;ve never grasped the complete concept of these directories.

What do they mean?


What do &quot;branch&quot;, &quot;tag&quot; and &quot;trunk&quot; mean in Subversion repositories?

There may be more than one way to ask this question, so here&#39;s a desciption of the problem. I was working on master and committed some stuff and then decided I wanted to put that work on hold. I backed up a few commits and then branched from before I started my crap work. Practically this works fine, I just now have a different branch as my main development branch. I&#39;m wondering how I could change things around so I&#39;m working on master again but it doesn&#39;t have my junk work and said work is on a different branch.

Some ways this could be asked/solved:
How do I rename my master branch to something else and then rename something else to master?
How do I back up master and then cause all commits I&#39;ve backed up past to be on a different branch?

Thanks for all the (quick) answers! They&#39;re all good.

Switch branch names in git

The company I work for is starting to have issues with their current branching model and I was wondering what different kinds of branching strategies the community has been exposed to?

Are there any good ones for different situations?  What does your company use?  What are the advantages and disadvantages of them??

Branching Strategies

What is the best way to get a log of commits on a branch since the time it was branched from the current branch? My solution so far is:

    git log $(git merge-base HEAD branch)..branch

The documentation for [git-diff][1] indicates that `git diff A...B` is equivalent to `git diff $(git-merge-base A B) B`. On the other hand, the documentation for [git-rev-parse][2] indicates that `r1...r2` is defined as `r1 r2 --not $(git merge-base --all r1 r2)`.

Why are these different? Note that `git diff HEAD...branch` gives me the diffs I want, but the corresponding git log command gives me more than what I want.

In pictures, suppose this:

&lt;pre&gt;
         x---y---z---branch
        /
---a---b---c---d---e---HEAD
&lt;/pre&gt;

I would like to get a log containing commits x, y, z.

* `git diff HEAD...branch` gives these commits
* however, `git log HEAD...branch` gives x, y, z, c, d, e.

  [1]: http://git-scm.com/docs/git-diff
  [2]: http://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html


How to get the changes on a branch in Git

What are the best practices and rules-of-thumb to follow while maintaining code?  Is it good practice to have only the production ready code in the development branch, or should untested latest code be available in the development branch?

How do you guys maintain your development code and production code?

Edit - Supplementary question - Does your development team follow &quot;commit-as-soon-as-possible-and-often-even-if-the-code-contains-minor-bugs-or-is-incomplete&quot; protocol or &quot;commit-ONLY-perfect-code&quot; protocol while committing code to DEVELOPMENT branch? 

How do you maintain development code and production code?

I&#39;ve got two branches that are fully merged together.

However, after the merge is done, I realise that one file has been messed up by the merge (someone else did an auto-format, gah), and it would just be easier to change to the new version in the other branch, and then reinsert my one line change after bringing it over into my branch.

So what&#39;s the easiest way in Git to do this?







How do I copy a version of a single file from one Git branch to another?

When I have two branches in Hg repo, how to merge only one file with another branch, without having all other files from changeset merged?

Is it possible to merge only certain files, instead of whole changeset?

Mercurial: Merging one file between branches in one repo

I&#39;d like to move the last several commits I&#39;ve committed to master to a new branch and take master back to before those commits were made. Unfortunately, my Git-fu is not strong enough yet, any help?

I.e. How can I go from this

    master A - B - C - D - E

to this?

    newbranch     C - D - E
                 /
    master A - B 

Content Type	Original Author	Original Content on Stackoverflow
Question	cmcculloh	View Question on Stackoverflow
Solution 1 - Svn	JoelFan	View Answer on Stackoverflow
Solution 2 - Svn	Bernard	View Answer on Stackoverflow
Solution 3 - Svn	Black Horus	View Answer on Stackoverflow

How do you branch and merge with TortoiseSVN?

Svn Problem Overview

Svn Solutions

Solution 1 - Svn

Solution 2 - Svn

Solution 3 - Svn

zsh problem: compinit:503: no such file or directory: /usr/local/share/zsh/site-functions/_brew

Generate list of all possible permutations of a string

Attributions