version-control

Mercurial and SQL Server Management Studio GUI plugins?

Does no such plugin exist? So to be clear, I realize that RedGate has their own SSMS SCC app, and I realize that VSS2k5 will integrate in. I'm looking to stay with Hg as that's where my source already is, and I'ld like to find something that my team can stay consistent with on their tools. As is, I guess I'm going to have to just run ...

Is there a web based SVN viewer that I can just point my broswer to a browse repos?

I don't want to install a single thing. There must be a web based viewer somewhere! I'm having a hard time finding such a thing in google. There must be somewhere online where I can simply paste "svn://nex-3.com/gtk-themes" and it will let me browse the contents. ...

Vendor Branching, Mercurial Style?

The scene: A purchased web application, with regular updates from the vendor. We then, heavily customize the look and sometimes add our own functionality or fix a bug before the vendor gets to it. For version control, we have been using Subversion following their “Vendor Branch” model each time we received a new release. This has the ad...

Show the latest commit value within a web application?

Hi Everyone, I have a few Rails applications and I use Git as the version control system. I use either GitHub or Beanstalk as the repository hosts. What I am trying to is quite simple in theory. Somehow show the latest commit ID number (hash?) in the footer of the web application. So that when I am looking at the web application I can...

Is there a way to setup Linked Resources relative to the .project file?

We have a Flash Builder (which is based on Eclipse) project that pulls source from different locations, included in the source control in which the project is. As per our organization requirements, the source code is present in directories not directly under the project directory. Initially we had the problem that all paths to the linked...

How can we effectively version a large web application consisting of multiple sub-applications?

I'm part of a team that operates a portal for our company. There are ~200 small, what we call applications, inside of the portal. One may be to submit receipts, another to submit a timesheet, another to see activities going on, etc. Each of these applications is fairly separate from the others, so we've created individual trunk/branch...

git - project evolution, branch or new repo?

I have developed a Google App Engine web application versioned on GitHub. I'm going to "port" this application making it GAE agnostic; this port would have several files in commons with the original project but also a different file system structure. Is it better to create a new branch (nogae) and work on it or is it preferable to creat...

Keeping a public and private version of my app using Git

I am building a Rails app that I manage with Git. All is perfect, but I'd like keep a public version as well as a private one. That is: the public version is for a public repository (for people to use), and the private version is for my own site. The idea is that both versions should be up-to-date, with the difference that my priv...

TortoiseHG: Close a named branch

I can't seem to figure out how to close a currently open branch when committing. Here is what I am doing: Open the commit window Type a message Click the "branch: branchName" button In the box that pops up, click "Close current named branch" Hit OK Hit Commit. And yet, the branch remains open. What am I doing wrong? ...

Get IIS website into version control

The Problem: Until now, I create a IIS website/app using the IIS manager tool. The problem is that changes to a IIS website aren't documented as they should be. For example: when I update the URL Rewrite rules this changes should be documented in a version control solution. What is your solution to solve this issus? ...

Git SVN rebase to tags only

Hi, I'm extending an open source project with additional functionality. So I'll be basing my code on the released version of the source code. The open source project uses SVN and I uses Git. How would I rebase only to the released version (SVN tags) instead of to the HEAD of trunk when a new version is released? Thanks. ...

what are the best distributed development methodologies for sharepoint

Hello Sharepoint experts ;) Let's say we have some distributed developers in different countries working on the same sharepoint project. Problems that they might face including (but not limited to): webparts deployment & debugging which doesn't work anywhere but the server. how can they apply source control over created sharepoint p...

Tortoise SVN: Resolve conflict using 'theirs'. What does it mean?

Can someone please explain the difference between the following two options of Tortoise SVN on conflicted files: Resolve conflict using 'theirs'. Resolve conflict using 'mine'. On a side note. Why on earth no one has ever reported this confusing use of terminology as a bug? ...

version control with minimum hassle

I'm looking for a program, that is capable to monitor file deletions/creation/renames and issues appropriate version control commands automatically. Using bazaar and subversion. Is there any? ...

What are A, B, and C in KDIFF merge

Why am I given three choices when merging between my code and someone else's? Shouldn't there just be my code, the other person's code, and the output below? The documentation for KDIFF doesn't help me understand. ...

Sharing files in a managed approach between hg repos.

Hello, Problem: One hg repository has a file I want to update & maintain in another hg repository, and I do not want to copy & paste. I do want to have the file available in both repos. Scenario: Working on Product 0001 Project A has an hg repository. Down the road, a Project B is spun up. There is largely no coupling between Projec...

Merging Xcode project files

There are often conflicts in the Xcode project file (Project.xcodeproj/project.pbxproj) when merging branches (I'm using git). Sometimes it's easy, but at times I end up with a corrupt project file and have to revert. In the worst case I have to fix up the project file manually in a second commit (which can be squashed with the previous)...

DVCS (or rather, any non-exclusive checkout VCS) and Windows Forms? Merge problems?

Does anyone have any experience with this? For instance, consider Subversion, Git, or Mercurial, and a typical Windows Forms form. Whenever someone edits the form, for instance repositions a panel to have a different parent, sometimes the form designer code generator rearranges more code than just that panel. Does anyone have any expe...

How to block a changeset from merging in TFS?

In TFS 2010, how can one mark a changeset so that it cannot be merged from one branch to another? For example, so it doesn't show in the "merge wizard" in Visual Studio when using the "Selected changesets" option. Basically, I want it to look like the changeset in question has already been merged into another branch. Our build process...

TFS vs SharePoint: what is the best location to store documentation?

Usually, business people keep their documents in the SharePoint portal. I am (as a developer) would rather keep them in TFS (or any other source code repository) closer to the source code. Also in the latest case I would make folders structure in way like "Src", "Doc", "Data" to keep everything more consistent. Could you please share wh...