Ok I got it. Here’s what worked for me. Check out a working copy Then go in Windows explorer menu, TortoiseSVN -> Check for modifications… Click on Check repository button Select All the files, right click and select the break lock option Delete the working copy and the one in repository. Voila! 🙂
Yes, having art assets in version control is very useful. You get the ability to track history, roll back changes, and you have a single source to do backups with. Keep in mind that art assets are MUCH larger so your server needs to have lots of disk space & network bandwidth. I’ve had success … Read more
The first difference is revert can work on a subset of the working copy while update works on the whole working copy. the other difference is in what happens when you want to go back to a version other than the last committed one. if we have revisions (caps are committed, lower case are changes … Read more
Using a file template is definitely the best solution. For example, if you have a database.ini file, commit a database.ini.template file and ignore database.ini in .hgignore
What I find works is to check in a version of the file with blanked or dummy values and then to run: git update-index –assume-unchanged [fileName] Git will then stop monitoring changes to that file allowing you to put the real config info into it without fear of checking it in. If you later make … Read more
WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or … Read more
There are many scenarios here where you might want to do this, I’ll make each scenario a headline, so that you can find the scenario that fits your case. Note that I’m still learning Mercurial, and I’d like pointers if something I say is wrong, using the wrong terminology, could be done better, etc. No … Read more
The best way to do this is using the ‘convert’ extension. You’ll use mercurial and both source and destination type and then use a –filemap with entries like: exclude path/you/do/not/want rename path/you/do/want . The rename is only necessary if you want to take the parts you’re keeping and move them “higher” in the directory hierarchy.
The short answer is no, it doesn’t seem to exist. As you can read in a Quora article, “it’s hard to tell where the version control system ends, and where some of the other parts of the development toolchain begin”. So, first, you need to be clear in what “features” you are interested in since … Read more
I would use Subversion (in fact I use it) [update: Jul 2014 — I use Git — see end of the answer]. SVN is: free, good enough (see disadvantages below), simple, works fine on Windows (and Linux too), a lot of people use it so it’s easy to get help, can integrate with most of … Read more