Both examples must work, but svn merge -r UPREV:LOWREV . undo range svn merge -c -REV . undoes a single revision, in your case REV would be 1944, i.e. the revision you wish to undo. in this syntax – if current dir is WC and (as in must done after every merge) you’ll commit results … Read more
I sometimes get this with TortoiseSVN on windows. The solution for me is to svn update the directory, even though there are no revisions to download or update. It does something to the metadata, which magically fixes it.
No, you should not add it to source control. The purpose of this folder is to move machine- and user-specific files to a central location. The explanation on the Visual Studio User Voice issue explains it well: So far, we have moved the .SUO file and the VB/C# compiler IntelliSense database files to the new … Read more
I found the solution reading the link that Gary gave (and I suggest to follow this way). Summarizing to resolve the tree conflict committing your working directory with SVN client 1.6.x you can use: svn resolve –accept working -R . where . is the directory in conflict. WARNING: “Committing your working directory” means that your … Read more
If you already have it checked out locally then you can cd to where it is checked out, then use this syntax: $ svn up -rXXXX ref: Checkout a specific revision from subversion from command line
Git is not better than Subversion. But is also not worse. It’s different. The key difference is that it is decentralized. Imagine you are a developer on the road, you develop on your laptop and you want to have source control so that you can go back 3 hours. With Subversion, you have a Problem: … Read more
I needed this as well, and with the help of Bombe’s answer + some fiddling around, I got it working. Here’s the recipe: Import Git -> Subversion 1. cd /path/to/git/localrepo 2. svn mkdir –parents protocol:///path/to/repo/PROJECT/trunk -m “Importing git repo” 3. git svn init protocol:///path/to/repo/PROJECT -s 4. git svn fetch 5. git rebase origin/trunk 5.1. git … Read more
The claim of why merging is better in a DVCS than in Subversion was largely based on how branching and merge worked in Subversion a while ago. Subversion prior to 1.5.0 didn’t store any information about when branches were merged, thus when you wanted to merge you had to specify which range of revisions that … Read more
Windows can only show a limited number of Overlay Icons (15 total, 11 after what Windows uses). Programs like Office Groove, Dropbox, Mozy, Carbonite, etc, will hijack a bunch of the 11 possible overlay icons (boy would it be nice if Microsoft upped the number of these as the number of applications that use them … Read more
Basically you need to “merge backwards” – apply a diff between the current and previous version to the current version (so you end up with a working copy looking like the old version) and then commit again. So for example to go from revision 150 (current) back to revision 140: svn update svn merge -r … Read more