Currently I would simply like to find all files that have not been modified in the last X days but ultimately I would like to be able to make more complex queries against my subversion repository. Is there a Subversion Query Language of some sort or an API that I could use? ...
We have some files in our project that can't be merged and hence the files must be locked by the users before editing them. Is there a way to force the user to lock a file before editing? We are using Subversion and Tortoise/visualSVN ...
My development team has worked with subversion for quite some time. The way that manage the trunk and branches is as follows: We (almost) always release from the trunk Each release gets its own branch. When a release is ready for QA, we merge the branch back into the trunk and create a new branch for the next release. Developers work ...
I am looking for a solution to build release notes from svn. What I want is a command line utility or something which can get me all the comments of checked in files from a given date. Thanks ...
When I go to update, I keep getting a locking error on a folder that no longer exists. My first thought is to go use svn-cleanup to fix whatever has broken. Instead, cleanup throws an error also: Problem running log svn: In directory "C:\xxxxx\xxx\" svn: Error rocessing command "append" in "C:\xxxxx\xxx\" svn: Missing "xyz" attribute...
My development group follows the unstable trunk, stable branches pattern in Subversion. Every month, a stable release branch is created from the trunk. Occasionally, changes need to be merged from these release branches into subsequent release branches and eventually, to the trunk. The problem is that, over the past few months, the merg...
I've got a 'git-svn' working tree. I'd like to clone a "pure" git repo off this, and then use git push/pull to move changes between the git-svn tree and the git tree, while also using 'git svn dcommit/rebase' to move changes between the git-svn tree and the SVN repo it's based on. This seems to work okay as far as moving things back and...
I've found myself asking the question: should I make one repository for all the projects at this client? or should I make a separate repository for each? Which do you normally decide? Please list the advantages and disadvantages of either approach which lead to your decision. EDIT: Please mark as duplicate for one of the following: ...
I have two SVN project using sharing another SVN using svn:externals. I want to have that same structure with GIT but I can't find how. ...
Hi, I have a directory under subversion control. I created a branch out of it just to test merging stuff. I took a file, modified line X in the trunk as "abc" and modified the same line X as "def" in its branch. Then, from the branch working dir I did: svn merge branchURL trunkURL . It updated the file with the content as "abc" at ...
Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to resolve conflicts. What tool do you use? Windows, OSX, Linux, free or commercial, you name it. Here's a few that I've used or heard of, just to get the conversation started: kdiff3, DiffMerge,...
Sometimes I'm working on a feature and hit a weird crash or something else I can't immediately solve. Then I wanna give my current source code to the guy next to me so he can also try solving it. Seems like I have 3 bad options and 0 good ones? commit it to trunk so he can fetch my changes. no! the code's not finished create a workbra...
Folks I'm facing repeated code conflicts while pulling from the shared git repo in the following scenario: There is a common svn repository There are several developers who track/sync this common svn repo with their own local git repos using git-svn bridge(via git svn rebase/dcommit) From time to time these developers using git need to...
Hi, I have a project repos already under svn control on a machine on LAN.When i browse through the machine containing the repos... i can see the folders physically present at the repos path. Then at sometime i imported a directory to the repos path....it added and commited it to the repos...but on browsing i cant see that dir at the re...
I'm relatively new to Git, but I've found it so easy to work with at home that I'd like to use it at work where our projects are stored in Svn repositories. Unfortunately, the repositories are slightly non-standard and I'm having trouble getting them cloned. Sure, they all have trunk, branches/ and tags/, but branches/ and tags/ have sub...
I'm a recent git convert. It's great to be able to use git-svn to keep my branches locally without disturbing the svn server. There was a bug that existed in the latest version of the code. I wanted to establish a time when it worked so that I could use git bisect. I couldn't find the right command to move back in time. Thanks. ...
I just created a Google Code SVN repository for storing my school projects and homework, and to allow easy transferring between school and home. Its default directories it creates are: https://simucal-projects.googlecode.com/svn/trunk/ https://simucal-projects.googlecode.com/svn/tags/ https://simucal-projects.googlecode.com/svn/...
I'm working on a change on my laptop. It's not ready to be submitted to repository yet but I'd like to keep working on my desktop too. My change set is quite big and not only it contains modifications, it also contains new files and deleted files as well. I could copy the complete local working copy to another machine and get the change...
I have a mixture of small and large projects in SVN. Some of them are so small I can't ever foresee myself branching or tagging. So, should I still stick with the trunk/branch/tag folder convention even if I'm fairly certain the branch/tag directories will go unused for the smaller projects? I just feel like it might be overkill. Tho...
Hi I want to checkout something out of an repository .. but wenn i type : svn co svn+ssh://URL i get asked for the password.I suppose he uses the username from my console which aren't the same. So how can i checkout something with svn+ssh with a different loginname ? ...