My project I am working on is version controlled under SVN. I had to do a large number of refactorings. For this purpose I took my workspace and created a new git repository. Afterwards I made the refactorings and committed to my local git repository as often as possible, made branches etc.. Meanwhile someone made commits to the SVN. No...
Here is our scenario: Developer A checks in changes which include new files files. Developer B does an update and all of a sudden, stuff breaks because files are missing. Developer B tries another update, nothing is pulled in, so he calls Developer A. Developer A says: "Hey, I checked them in, are you blind?" Only when Developer B u...
In all the tutorials I see of using SVN or Git, they always show them updating individual files. I may work on 100 files in 1 day, is it normal to work on many files and at the end of the day, just do 1 commit for all the files instead of doing each file individually that I modify? ...
I'm using subversion to host my own repository for a WordPress installation. I've got it set up so that all of the core WordPress files are in their own directory (called wordpress) and set up to use svn:externals to link to the WordPress repository. I then have my own copy of the wp-content directory (located outside of the wordpress di...
According to the docs: (mc) mine-conflict - accept my version for all conflicts (same) (tc) theirs-conflict - accept their version for all conflicts (same) (mf) mine-full - accept my version of entire file (even non-conflicts) (tf) theirs-full - accept their version of entire file (same) I don't understa...
I'm looking for .svn folder content description or specification. Could you suggest something? I'm going to write an app which operates with working directory. Thank you! ...
I have been running my web development company by myself for the last 6 or so years (and as added background, I have never worked in a development team as I am currently a university student and have only just run my own business, so I have no experience in that regard as of yet), but I am gearing up to take on something a little more am...
I've got a post-commit hook script that performs a SVN update of a working copy when commits are made to the repository. When users commit to the repository from their Windows machines using TortoiseSVN they get the following error: post-commit hook failed (exit code 1) with output: svn: Error converting entry in directory '/home/websi...
I am working on Zend Studio and using Subversion. Since yesterday, my account is no longer accepted; I get errors like: "the account is not matching"... Can someone tell me how we edit a svn account in Zend Studio? The colleague who installed svn is missing! pas de chance ...
I have a repository configured like this: +---CollectionA | \---project1 | \---trunk | \---sourcecode | \---tags | \---rel-1 | \---project2 | \---trunk | \---sourcecode | \---tags | \---project3 | \---trunk | \---sourcecode | \---tags | \---rel-1...
Can anyone recommend a Windows SVN repository browser without shell integration? I need it to be portable (carry with me on a flash drive), therefore without an installation process. This rules out TortoiseSVN. My repositories are local, so I need a tool that can access a file repository. ...
I'm looking for a way to specify that a subset of files should not be changed when merging in modifications from a particular branch, using Subversion. I found someone asking the same question, but for git. What I have is Maven pom.xml files, which are set up when the branch is created and updated for each release from the branch. Whe...
I use Versions on OS X to manage all my code in Subversion. I'm not interested in significantly changing my current workflow until Git has a great GUI app like Versions. One of my clients wants me to push my code to a private GitHub repository. There are many questions and articles about running Git locally and pushing to a remote Sub...
So we are pushing to create good processes in our office. I work in a web shop that has been doing web sites for over a decade. And we don't use version control. I know! It's bad, not my fault. I'm the guy with a SoftE background pushing for this at a minimum. The tech lead has been looking into it. We all use Mac workstations and ...
I am using an ORM which generates large amounts of files from a CLI. Is there an easy way to run the svn add on all files within a directory which appear as ? when I run svn status? Edit These files exist in a directory tree so adding * for one directory will not work ...
Outside of work I use SVN for my personal projects I wish to keep private. I use it to synchronise sources between my laptop and desktop, for off site backup and the normal advantages SCM brings. The current trendy source control system is GIT and I must admit I'm considering moving to it. But given what I use it for and that I alread...
Hi I'm trying to understand the details of the subversion merge commands. I think understanding the difference between a change that is also a conflict and a change that is not a conflict would help. This is a followup to this thread. Thanks! ...
Hi, I have a newbie question about Git: I need to move back and forth in a history of a branch. That means, I need to get all the files to the state they were in in some old revision, and then I need to get back to the latest state in the repository. I don't need to commit. With SVN, it would be svn up -r800 to get to revision 800, ...
svn add guess_language/ svn: warning: 'guess_language' is already under version control Why is this? When I downloaded it, it was under SVN. (I downloaded it from SVN) How do I release that svn...so that I can turn it into a regular directory? ...
Hi, I've seen that i already have both svn and svnserve (and a .subversion dir in my home). svnserve should be svn server, as far as i know, but how can i run it? I need something very basic, not linked to apache or any server, just to version files on my own computer for personal development (svn is integrated with TextMate that i use)....