svn

Subversion - Ingnore files/folders on merge

Hi there! I'm currently using SVN for versioning my software projects. On an ongoing project, I have the trunk, for client common features and specifications and branches, for client specific ones. Is there any way to mark some files / folders that shouldn't be merge into branches each time I perform such operation? Thanks in advance...

(Yet another) What's the best conversion from an SVN repository to HG repository(ies)?

My company has a large Subversion (SVN) repository, and for various reasons, we are considering migrating to Mercurial (HG). I'm hoping to learn the "best practice" ideas for our situation. Our SVN repository is fairly monolithic, and looks something like this: trunk Python_Project_1 Python_Project_2 Python_Shared_Code Flex_Code ObjC...

Hosting GPL and non-GPL code in same repository?

Hi, is it 'legal' to host GPL and non-GPL source code in the same svn repository, or would that imply that all code in that repository becomes GPL? The difference sources are in a layout like this: /bsd-code/trunk/ /bsd-code/branches/ /bsd-code/tags/ /gpl-code/trunk/ /gpl-code/branches/ /gpl-code/tags/ We want to keep the bsd-code ...

How do I convince my team to move from SVN to Mercurial?

The team I'm working with uses SVN for keeping version control. (It was used for years by them.) Recently I found Mercurial as a VCS and it looks much convenient for me than SVN. What arguments wound you suggest most convincing in order to move to Mercurial? ...

How can I copy a git repository into a new svn repostory?

I have some code that I want to put into an svn repository for a client after doing some work on it in git, is there any way to initialize a svn repository using a git repository's history? I have initialized git repositories from svn repositories, and regularly commit between existing svn and git repositories, but I don't know how to...

Cross-repository merging in Mercurial?

I am considering a switch from SVN to Hg and currently have a typical SVN layout for project Foo: Foo trunk branches 1.0 1.1 I can import this structure into Hg using the hg import command, creating a separate repository for the trunk and two branches (by using the --config convert.hg.clonebranches=1 import switch.) Now, ...

Best ways to browse a SVN with Zend Framework

I would like to know what are the best ways/practices to browse a SVN (like http://core.svn.wordpress.org/) with Zend Framework. As a student learning Zend Framework, I am not very used with this framework so I would like to start on the right direction. It has to do simple tasks like list all files, retrieve a revision of a file, get th...

Are Subversion 1.6 & Xcode 3.2 compatible?

Trying to get Xcode to work with Subversion server. Server: Subversion upgraded to 1.6.9 (Mac OS X Leopard 10.5.8) Client: Xcode 3.2.1 (Snow Leopard 10.6.2 with Subversion 1.6.5 though not sure that matters) Repository on server is setup and working fine via command line. However, I get an error when trying to create the Repository...

subversive svn:externals reference to a fixed revision does not honor revision

an svn:externals reference like this dojo -r 21434 http://svn.dojotoolkit.org/src/dojo/trunk/ is happily accepted by subversive in the set properties panel and the link is established. However, the revision is ignored. Each time I upgrade, I get the latest from trunk. It does not seem to matter whether or not I include a space betwe...

how to upload my project files to online svn host ?

i have account on projectlocker (free svn host) , and i dont know how to upload my project files to it i dont find any option for that in my dashbord and i am using tortoiseSvn on my computer , so how to upload files and configure tortoiseSvn ? ...

Subversion - Timestamp changes, but content does not

Hello there, I think this is hard to describe, but I will try: We're using Subversion an Buildtools. When we make a Build from our Project, several files will be overwritten, of course. So the timestamp of these files changes, but the content might be the same as before. An svn diff will display the following for exanple: - test.tx...

Converting a SVN project containing tags to Mercurial

I am attempting to use the hg convert Mercurial command against an SVN repository that has a trunk and some tags (but no branches.) The SVN folder layout looks like this: Foo tags 1.00a 1.00b-test trunk Although the import succeeds, it would appear I am only gettting the trunk and the tags are nowhere to be seen in the Hg...

Is Subversion more "supported" by continuous integration tools than Mercurial?

We are currently using NAnt on our build server, with CVS as our source control system. Seeing the need for improvements, we are investigating continuous integration tools and other source control systems. Subversion seems to be the most straightforward option to move on to from CVS, but a distributed version control system like Mercuri...

Tag SVN "Nightly" Builds with CruiseControl.Net

How would I do a nightly or other scheduled build for CruiseControl.NET without having a duplicate project? In my current config, every 60 seconds, I am checking out the trunk using Subversion, running MSBuild, then either NUnit or MSTest. I would like to commit back to SVN as a tag, but I don't want it on every successful build. I wan...

Is it bad practice to use two SVN clients at the same time ?

I am currently using Tortoise SVN and a SVN plugin from my IDE. Sometime problems appear, and it seems that my .svn aren't always in a consistent state. So is a bad practice to use two SVN clients ? (looking from a practical approach). Do you have links related to SVN best practices ? Thank you. ...

Are there any web SVN clients built on the PEAR VersionControl_SVN library?

The PEAR VersionControl_SVN library looks pretty robust, albeit still in alpha - it claims to support all commands including commits. Are there any actual web clients built on the library? I haven't found one, or any web SVN client that handles commits, and I'm wondering if I should build one. ...

Subversion timed commit

I've got a folder under version control; the contents aren't source, but they are binaries that are modified frequently and would generally get committed once a day. Problem is, the consumers of those files can't grasp the concept for source control, they don't realistically have access to the folder in question and 'they can't be bothe...

Subversion unexpected 405 on adding file

I've just added a new user to a SVN repository. They have read/write perms on the repo. They also have file perms (up to Modify, including Write and Create) on the Repo directory. When the user tries to add a file to the project, or commit a file, they get a 405 response (note: not a 401). They seem to be authenticating correctly, but ...

Open working copy file from eclipse history view

The history view of eclipse shows you a list of files changed in a certain revision. When you open the context menu on one of these you have the option 'Open' which opens a view of that file in that revision. How can I open the editor for the selected file, i.e. the file in the version of the working copy, right from the history view? ...

SVN remove changes from repository, but keep them in my checkout?

I have a few files that were part of an update that were mistakenly committed to the main trunk before they were ready. Is there a way to 'undo' this checkout and roll the repository back a version, while still keeping the changed file in my checkout? I'm using tortiseSVN ver 1.6.5 on Windows XP, if that makes any difference. example:...