I'm bad dumb and having no google fu. How do you get diff (on os x if it matters...) to look like svn diffs? Couldn't figure it out from the man page either. :( What I want Index: test.txt =================================================================== --- test.txt (revision 365) +++ test.txt (working copy) @@ -1,7 +1,9 @@ This ...
Contrary to a 'normal' svn directory structure I'm using the following structure: trunk/ project1/ project2/ project3/ ... branches/ project1-branch/ project1/ project2/ ... project2-branch/ project1/ project2/ ... tags/ project1/ V1 V2 ... As you see I don't have separate triples (tr...
I've started tracking an svn repository with git by cloning only its trunk directory. Now I want to track the other stuff, but I don't want to have to clone it again just to use --stdlayout since it takes a long time to download and I already have most of the code locally. How do I change the repository layout to match svn trunk/branches...
I have installed svn console client from these binaries - subversion.tigris.org/getting.html#windows - 1.5.6, 1.6.4, 1.6.5. But no release seems to work. Just it can't checkout from any repo (code.gjangoproject.com; code.google.com): svn couldn't connect to server. There is bug on debian - http://bugs.debian.org/cgi-bin/bugreport.cgi?bu...
I have one repository with read-only access on remote server. On my computer I have just working copy of that repository which I'm working on and I need to commit whole working copy to my own Repository with full access. Simply it looks like: Update WC, add/edit some code, commit it on my own repository. Is it possible because I can't f...
I develop PHP apps in Eclipse and I'm wondering, is there an easy way of downloading my MySQL schema to a specific folder so that when I commit to SVN it's included? EDIT: I'm using phpMyAdmin to export my schema. I'm just wondering if I can automate this step in Eclipse. ...
I'm quite new to git and I'm trying to move a svn repository to git. I followed the guide below so now I have a git repo on my server http://pauldowman.com/2008/07/26/how-to-convert-from-subversion-to-git/ So, if I do "git branch" git replies "* master" and if I do "git branch -r" i get a list of all the branches in the svn repository. ...
I am doing some C programming for school and I have found myself reusing libraries that I have created, over and over again (stacks, user input, error handling, etc). Right now, my personal SVN directory structure looks like this: trunk/ |-- 2520 | `-- assignments | |-- A2 | |-- Makefile | |-- README | ...
How do I get my SVN revision number to appear on my website each time I commit? ...
There's more than one file system Most version control tools operate on the local disk file system. Database objects for most relational database systems do exist in a file system, inasmuch as there is a textual name identifying the object and the creation script can be retrieved or at least generated using this name. But it isn't th...
I work with a subversion repository for a "generic" package that is full of files that shouldn't be there (site-specific files, hacks, etc). I do not have access to change this, and I've been stonewalled when I ask about having it changed on my behalf; I'm now after a workaround. Is it possible to exclude some files from being checked o...
We've recently created a branch with a version of code customized for a certain client. We're working on both branches at the same time, commiting 'common' changes into the trunk, then merging them to the branch. Recently, we've come to a troublesome situation. In trunk/bar.c we have (among others) a foo() function. Now, in branch/bar.c...
Hi, I currently use svn at work. Our setup is: everyone has a working copy and we commit to a svn server served by apache2. So I commit changed, the other update, and everyone can work on the copy as they wish. So it's pretty easy to deploy. But now, I'd like to do the same thing but with Git. Would it be possible? I'd like to have ...
What is the concept of switching branches in IntelliJ? I must be either blind or an idiot... I would assume there'd be a "switch to copy" option or something like that, but there is none... EDIT for clarification: my prev IDE had a simple "switch to copy" option, which updated all files being different from current branch/trunk. Intell...
Here's the dilemma: I have a folder structure: product/branches/stable product/branches/someotherbranch product/tags product/trunk I have two users: John and Joe. I want to prevent Joe from committing to: product/branches/stable and product/tags What is the pre-commit hook syntax in Perl or Bash or whatever to get the job done? ...
we're trying to sort out some conventions for handling dependencies with code checked into svn. the previous method was basically a free for all, meaning projects couldn't be checked out and built without fiddling with references (most projects are C#). we're fixing this one step at a time, and are now checking in binaries to a separate...
I'm just trying to hook Trac/SVN together so that my SVN commits manage my Trac Tickets. I've read the documentation and understand (kind of) that the ticket updates rely on a dev using the correct syntax in the comments field which not to put to fine a point on it I think is um... lets use the world unreliable to avoid offending anyone...
If I use svn copy to take a snapshot of a portion of a repository, how can I update that snapshot? Use case: myrepo/ trunk/ src/ something.c something.h tags/ branches/ mkdir branches/user1/trusted svn add branches/user1/ svn copy trunk/src branches/user1/trusted myrepo/ trunk/ src/ something.c ...
For one of my ASP.Net site I use AnkhSVN to commit to a VisualSVN Server with a post commit hook to update the live website. This setup works great for every directory EXCEPT the Bin directory. When I build my solution the dll is placed in the site's /Bin but does not show up in Pending Changes. If I select the dll, right click -> Refre...
for example: I have app A, which references library A and library B. in addition, library A itself references a different version of library B. (these are all in C#) I want all references to point to a binary DLL file. right now I have a lib folder like so: lib/LibA/v1/LibA_1.dll lib/LibB/v1/LibB_1.dll lib/LibB/v2/LibB_2.dll let's sa...