version-control

Going against the common source control used in the organisation

Hi, The company I work for exclusively uses Clearcase. I feel it is not worth the effort to learn and use it as my project would not involve too many people(max of upto 3 people), neither would it involve fancy development flow. How do I convince my manager on using a separate source control for this when they bring up the point of "IT ...

RW Access git repository using svn (git-svnserver)?

Is there a program that does what git-svn does, but in a situation where the repository on the server is git, and the developer uses svn? I know that github.com allows svn access to the git repositories they host, but it doesn't look like they've released this project open source (yet?), and using their servers is not an option for me ...

How to serve Mercurial repositories in the browser correctly?

Hello. I'm setting up my freelance server which will be using Mercurial for all the version controlling. Each project will have it's own folder, with it's own repository. Which I can then clone from my home computer, work computer or any other computer by going to that particular folder. I'm wanting to serve these repositories up into ...

suggestions for first-time importing and checking out project

Hello, Subversion 1.6.6 using the commend line client Importing and checking out project for the first-time. I find that when I create a new project I do the normal directory structure, i.e. game_sys_proj /trunk /branches /tags Steps : 1) I import game_sys_proj to subversion repository. 2) Delete game_sys_proj directo...

Using git for the first time...

I want to add a project which is located in my documents into a git repository, is this do-able? Thanks, I've never used git before ...

git version control with local files

Ok I have a project in a folder called mywebsite which is located in my documents folder on my mac. How do I use git to version control this folder?? Every time I try something I end up with a fatal error of some sort and it's really annoying me now, can you help? I do git init, then mkdir and then I've tried adding and cloning the fil...

Problem with refreshing the status of files with VisualSVN and AnkhSVN

We use VisualSVN Server as our Version Control server. We integrated TortoiseSVN into Visual C++ 2008 using VisualSVN. Now, I want to see if a file is locked by another user. When I press the "Refresh Status" button, nothing changes. What am I doing wrong? I also uninstalled VisualSVN, and installed AnkhSVN instead. The same proble...

How do I make Beyond Compare ignore certain differences while comparing versions of Delphi Form Files

I use Beyond Compare (version 3.1.10) to compare different versions of Delphi Form Files, but I don't want to see differences concerning ExplicitTop, ExplicitLeft, ExplicitHeight and ExplicitWidth. Details: These lines will always begin with a number of whitespace characters, then "ExplicitXXX = " and a number. Older versions of Delphi...

How to extract a subset of history from Git?

Update: I tried to simplify the real example here to get a clear explanation of my options, but that didn't really work. The linked examples below so far are too general to get even this simple example working. I was able to do this type of thing with SVN all the time and got quite skilled at it. Now I'm finding it extremely difficult i...

Batch 'svn cp' on the server-side

I have a monolithic trunk which is comprised of many projects and their corresponding shared modules. I wish the database was organized in a more flexible manner, but it isn't. What I'd like to do is create a branch which is a sort of project-specific refined view of the trunk. Really, it's a tag, because I only want to write it once ...

git - merge to another branch

I have two branches, master and dev. I always work on dev and only check code into the master branch once it's been approved for production use. When I do so, I have to do the following: git checkout master git merge dev git checkout dev That's awfully verbose, and since I do it frequently, I'd like to minimize it. Is there any one gi...

Other options besides svn:externals and shared repository checkouts?

I want to share my code libraries between multiple PHP projects. I am using SVN (unfortunately). What other options are there to share code besides using 1) svn:externals or 2) a shared repository checkout + paths in config files? My objections to svn:externals are: 1) Mercurial does not have this, and I prefer that; and 2) it is easy ...

implementing version control for webdevelopment

I'm trying to make the move into version control, as my projects are getting larger. Currently my development goes something like this: I have the "live" version hosted online I have a local version, as well as a local webserver I edit the local version and do testing on my local webserver Finally, I'll run Unison which updates the liv...

Sharing code across different source control systems

The product I'm working on has a mac and pc version. The PC version uses Microsoft's Team Foundation Server and the Mac uses Subversion for source control. Right now we have a little bit of shared code between the two and it currently lives in both systems and will inevitably get out of sync. What would be some ways to keep these in syn...

Version Control for Binaries and the Computer Illiterate

I'm working on a project that deals with lots of people editing binaries, and as a coder, I'd seriously like some sort of version control. We don't deal with too much text, so I'm looking for something that allows file locking but doesn't care about merging, and which keeps track of changes. Also, many people working on the project are n...

Source control: what version numbering should be used for branches?

If a branch is created in source control, what version number should be used if there is a release of the branched code? eg. If the last version number was v1.2.8 and a branch is created, what should the next version numbers of the branch and the main trunk be? ...

Can I edit the message of an older revision in Bazaar?

How can I edit an older revision's message to more correctly describe its changes? ...

Database under version control (Sitecore)

I have just read the following post on SO; Do you source control your databases We are working with Sitecore and normally Attach 3 standard databases to our MSSQL server. We have a Core , Master and Web database. In the proces of developing the different templates on the backend of Sitecore we all use one database and just publish our...

Keeping a VCS-held open source project mod up to date while using DVCS for managing my mod's changes

I would like to mod an open source project held in SVN. I would like to use Mercurial to hold my mod in version control. (The reason for Mercurial is that I would like to keep track of changesets so that I can split up the mod into components - this is necessary for working with the OpenCart project for example as it doesn't support ext...

Web.config Versioning

Currently I am using a shared database model for our development. I know, it's better to use local development databases to do database versioning the right way without one developer breaking everyone else's code. So that's what I'm trying to get to. I have a question about the web.config file though. How do I ensure that once every dev ...