TortoiseSVN: Adding additional files after using SVN Checkout dialog “Only this item” option

You right-click on the root, select repo-browser, find the relevant bits you want to download to your working copy, right click and select the “update to revision”. To remove items you have downloaded, right click on the item in your working copy, select the same menu (update to revision) and select “exclude” from the depth … Read more

Why should I use git instead of svn?

Here my personal experiences with git vs. svn: Git vs. SVN: git tracks state, history and integrity of the source tree. SVN only tracks state. Especially when merging, git’s extensive use of stored history (across renames and merges) comes handy to make much better informed decisions leading to less conflicts. Having a complete, cryptographically verifiable … Read more

Including new files in SVN diff

To make svn diff include all the unversioned files from your local working copy you have to add these files first. svn diff outputs the same changeset that svn commit would use. If you know for sure that all unversioned files should be added here’s what you could do. Prepare a list of unversioned files … Read more

Resolving a merge conflict when I do svn update

When you have multiple people changing the same file at once, it’s very possible for both to change the same lines. This is what happened to you. Sally changes the same lines Harry was changing. When Harry did svn update, Subversion detected this, and is asking you what to do. A word of warning: Sometimes … Read more

Folder structure for many projects in one SVN repository?

You have two options for this. The one you already mentioned, and that is to have a trunk for each project (option 1): https://simucal-projects.googlecode.com/svn/projectA/trunk/ https://simucal-projects.googlecode.com/svn/projectA/tags/ https://simucal-projects.googlecode.com/svn/projectA/branches/ https://simucal-projects.googlecode.com/svn/projectB/trunk/ https://simucal-projects.googlecode.com/svn/projectB/tags/ https://simucal-projects.googlecode.com/svn/projectB/branches/ Option 2 would be to have one trunk with each project being a subfolder under trunk: https://simucal-projects.googlecode.com/svn/trunk/projectA/ https://simucal-projects.googlecode.com/svn/tags/projectA/ https://simucal-projects.googlecode.com/svn/branches/projectA/ https://simucal-projects.googlecode.com/svn/trunk/projectB/ https://simucal-projects.googlecode.com/svn/tags/projectB/ https://simucal-projects.googlecode.com/svn/branches/projectB/ The advantage of option … Read more

Is using a central repository going against GIT’s purpose?

Not really. DCVS just allows more freedom in how to interact between developers without involving the central repository. The official repository is only official by consensus. Linux also has a central repository, the one from which the “official” kernel-releases are created, but there is no physical difference between the central, “official”, repository and client repositories … Read more

Unable to commit to Subversion

You can clear this error w/out a reboot: Identify (or create) a directory in the root SVN repository that was not a part of the failed commit. Create a new file in the directory from step 1. Commit the new file (and directory if created in step 1). Because the file is new, it doesn’t … Read more

What tools do you use when integrating with Subversion on Windows? [closed]

Tortoise is the classic interface to SVN on windows. It integrates into the Windows shell, so it’s just a right-click away to add or checkin a file, or group of files. It does include some visualisation (showing the structure of the branches and merges). For IDE integration and issue tracking integration, there are other tools, … Read more

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)