I'm working on a relatively new project using Subversion. I've already branched off a couple of times and merged that branch back to trunk with no problems. However, my latest merge is failing - and it seems to be tied into the fact that I added a new file to the branch that does not yet exist on the trunk (in this case, GradientView.h)....
We are using Perforce. In the depot are some projects that have their own main/branches/releases sub folders. There are also some resource files (png, mp3 and so on) that are needed (shared) for some of the different projects. Those don't have the main/branches/structure. Currently they are stored in a seperat folder in the depot that is...
Background I work on a lot of small projects (prototypes, demos, one-offs, etc.). They are mostly coded in Visual Studio (WPF or ASP.NET with code written in C#). Usually, I am the only coder. Occasionally, I work with one other person. The projects come and go, usually in a matter of months, but I have a constantly evolving set of comm...
I have been using git and github with my small team of developers for our projects. I can't help but think that we aren't doing it right. I am interested to hear how others use this workflow within their projects. How we use it: We branch before each change, merge back into the master, commit locally and push to our github repo. We then...
We've been using subversion for version control for our software projects for quite a while now. Since we develop in python, I've recently started using subversion to deploy working copies of the sites. When a site is updated in the repo, a post-commit hook is called on the server and it pushes the changes to the live sites. Continuing ...
Hi I'm looking to refine my workflow around NHibernate and a relatively frequently changing schema, and how best to deal with this - I would like the same solution to apply to production systems, so I think I need a migration engine rather than just Schema Update. What I want to know is how i can refine the workflow as far as possible s...
I'd like to manage Hudson's configuration files with subversion for backup. The Hudson Wiki lists the directory structure of $HUDSON_HOME like so: HUDSON_HOME +- config.xml (hudson root configuration) +- *.xml (other site-wide configuration files) +- fingerprints (stores fingerprint records) +- plugins (stores ...
I am an old time Visual SourceSafe developer but now I want to change the route. I heard about GitHub. Does anybody use GitHub on Windows for ASP.NET applications? What is your take? What are all the bug tracking systems we can use with GitHub? ...
Currently there are some challenges with managing application versions and deployments at the shop I work in. Typically we just change the code(corresponding DLL's) that we need to support our changes and drop the code into production(cut and paste). The most pressing problem is that we need a way to know and to review the code that is...
I’m in the midst of preparing some SCM guidelines for our Subversion users and came across a point of contention with the team. Is there ever a valid use case for someone to make consecutive commits with identical messages? If you take the approach that a commit message should describe the “what” and “why” of code changes it’s difficult...
Flashbake is introduced by Cory Doctorow and discussed here and its project page is here. It hides most of the complexity of git and allows simple configuration. I'm looking for something for Perforce since I have 10s of GB growing to 100+ GB in the next year of a few MB files (pictures mainly) which might not be ideal for git. I also...
Can I take multiple revisions in Subversion and combine them into one? I'd like to be able to take a few commits that include some interim blind alleys that I no longer care about and produce a single revision. For no reason other than to tidy up the svn history of a bug fix a litle bit. ...
I often browse sourceforge and download the source files of things that look interesting to me, however there are quite a few VCS systems that I have seen in use on there, and I don't want to download the required software for each VCS, just so I can download the files. Except for manually creating the folders and downloading the indivi...
What happens when a user installs an ad hoc distribution of an existing app? And what happens if this app (or a newer one) hits the App Store officially? To sum it up: A user already has a v1.0 and receives a v2.0 ad hoc A user has the ad hoc v2.0 and the official public release of v2.0 hits the store A user has the ad hoc v2.0 and an...
I'm maintaining a homebrew web-based CRM that I version-control with Subversion. What I want is to have the revision number written into a file after I do an export to the production server so that I can display it in the CRM's status page for debugging reasons. Is there any way to do this with command-line tools? ...
Hi, We do a lot of XML editing in our department. The problem lies in version control of large XML files. Obviously we would like version control to: Show the differences between different versions, and differences between any two versions at any point in time. Be easy to administer and maintain - a lot of people in the department are...
This question occurred to me whilst playing around with git, but I'll ask the general case... I just thought of a feature which might be nice for version control, but I don't know if it exists or what it is called. I want to call it persistent local changes. Say I have a config file in svn, which has lots of useful non-recreatable stuf...
How is performance in the current version (4.7) of Accurev? time to checkout per 100mb, per gb? time to commit per # of files or mb? responsiveness of gui when 100+ streams? I just had a demo of Accurev, and the streams look like a lightweight way to model workflow around code/projects. I've heard people praising Accurev for the str...
If your application has a public API that people develop against then what do you do in following scenarios? If you publish service pack of your application do you change the version number of assemblies? Similarly do you change the version number if you provide a hot fix? If you do, do you provide policy files for assembly redirecti...
Is it possible to know which users checked out a repository of an SVN Server? Thanks ...