svn

how to update and merge branch in netbeans?

im using netbeans with svn. i've checked out a project and then i used "copy to..." and chose to copy the trunk to a branch. i deleted the working copy of the trunk and checked out the newly created branch into a working copy and made some changes both in the trunk and the branch. now..how do i update the branch with the new data of th...

Using Git to work with subversion: Ignoring modifications to tracked files

I am currently working with a subversion repository but I am using git to work locally on my machine. It makes work much easier, but it also makes some of the bad behavior going on in the subversion repo quite glaring and that creates problems for me. There is a somewhat complex local build process after pulling down the code and it cr...

importing a project into a svn repository question

im using netbeans for svn. i open a project in netbeans and then i import it to a svn repo. it seems that although im only importing the project folder, svn creates .svn folders in all folders within this project folder. why is that? i thought that i was only creating .svn folders to checked out projects, not imported ones? now this ...

What's the smartest way to organize SVN for translated versions of the same project?

I apologize because I know this has been covered over and over again, but I'm trying to understand the smartest way to cleverly use subversion to our benefit. (*Note: I know our method is not the BEST way to handle localized versions, but external factors are forcing us to work this way on current projects) We have a fairly static webs...

Sell me Distributed revision control

I know 1000s of similar topics floating around. I read at lest 5 threads here in SO But why am I still not convinced about DVCS? I have only following questions (note that I am selfishly worried only about Java projects) What is the advantage or value of committing locally? What? really? All modern IDEs allows you to keep track of you...

svn: changeset = revision?

i wonder if these words are synonymous with eachother? ...

source code syntax highlighting for trac?

i've intalled trac on my ubuntu server but there is no php syntax hightlighting. i have installed pygments using apt-get install but how do i configure trac so it uses hightlighting for svn browsing? ...

Typical SVN repo structure seems to be sub-optimal for continuous integration...

I've set up our SVN repository like the Subversion book suggests, and this is also how my previous companies have done it. It looks something like this: /trunk /branches /tags /extlibs /docs where the first three are pretty obvious, and extlibs is for 3rd party assemblies that we wouldn't typically recompile ourselves. All of this w...

Prevent committing code with svn if certain obsolete C/C++ functions are used

Is there a way to prevent developers from committing code when certain unsafe or obsolete functions are used? For example: scanf atoi gets etc.. ...

Tortoise SVN : soft Link or Sharing Repository

Hi is it possible in Tortoise SVN to create soft Link or Sharing Repository. Explanation: suppose I have 2 Repository A & B A have 2 folders 1 and 2. B also have 2 folders X and Y Now the contains of folder X is suppose to come from folder 1 in A Repository. If one update some files inside X directory that update should go to...

long vs. short branches in version control

I wonder whether anyone knows some research done with the question "What is good/bad in long/short branches in version control?" I'm specifically interested in academic researches performed in this field. My questions are: What problems (or conflicts) long branches may produce and how to deal with them How to split a big task onto sma...

Clearing TortoiseSVN authentication cache from the command line

TortoiseSVN is nice for the most part, but one thing that blows in a team development situation where more than one person is using a particular PC is the authentication. When I'm working on stuff, I like to save my credentials so that I don't need to keep entering it in for logging, branching, committing, etc. The problem is that I al...

Understanding the output from svn export

Working on some tweaks for a build script, I noticed that the output from svn export has an 'A' in column 1 for each file exported. A C:\build\file1 A C:\build\file2 A C:\build\file3 The subversion book describes the meaning of the various columns for svnlook changes and svn status, but I'm not having much luck finding the me...

Subversion with MacVim configured as the editor

I'm using Subversion to checkin a file on OSX. I have my EDITOR variable configured to MacVim My .profile includes: export EDITOR=/Applications/MacVim/mvim When I checkin with the -m option (svn ci somefile), MacVim gets launched but then Subversion immediately displays: Log message unchanged or not specified (a)bort, (c)ontinue, (e...

Does ActiveCollab subversion integration work with subversion over ssh?

I'm trying to setup a repository in an ActiveCollab project. During setup, it reports that the connection tests successfully. However, when I try to actually update the repository, I get the following message: Could not obrain the highest revision number for the given repository. If I try to browse the repository, the following error ...

Excluding .svn directories in Rake cp_r

I'm writing a rakefile using Albacore for my .NET stuff, and I'm trying to figure out the easiest way to copy a project to another directory (artifacts) while excluding the .svn directories in its subdirectories. Suggestions? I'm running into a wall here. ...

trac with multiple svn repos?

is there a way to configure trac to use more than one svn repo in trac.ini? ...

Converting mercurial repository to svn repository

I know you can convert svn repository to mercurial repository (or use mercurial as a client to svn repo) but what I want is to convert mercurial repository to svn repository. We have some tool that uses SVNKit, and we'd like to continue use it, but want to be able to work on mercurial repository. Hence we want to completely convert merc...

Keeping a database structure up to date in a project where code is on subversion?

I have been working with Subversion for a while now, and it's been incredible for the management of my projects, and even to help managing the deployment to several different servers, but there is just the one thing that still annoys me. Whenever I make any changes to the database structure, I need to update every server manually, I have...

MonoDevelop Exclude a folder from SVN

Is there a way to tell a MonoDevelop project to exclude from source control a folder in the project. The folder has large SQLite databases I don't need/want published. ...