We are using a Subversion server at my job for source control. I was thinking that rather than keeping up with my own branch, I would run Mercurial on my workstation, commit locally, and then commit to the Subversion trunk whenever I’m done with whatever feature I’m working on. From my understanding of DVCS this is theoretically possib...
Hello, How do I set some group policy rule or mechanism to make sure that every developer commits their code to the source control? I use visualsvn server with Ankhsvn client btw. Thanks ...
I have some projects that run on custom hardware. Now the hardware has changed, which required some software changes. Therefore, there is source A for "old hardware" and source B for "new hardware", which are 95% the same. If a new feature is added in the future, it has to be done for both versions. In other words, A und B will exist si...
I avoided CodePlex because of it's lack of support for proper SVN and was dissuaded by complaints about short comings. Recently, I have been wanting to port my project from beanstalk over to codeplex because the latter is more social. What problems have you encountered and how good is the support for SVN. How good is the SVN bridge? ...
I've recently been working through a large codebase, refactoring and generally improving design to increase coverage. Also, in quite a few files I've removed excess using statements, moved methods so that similar functionality is close together, added regions etc. but not actually changed the functionality of the code in the file. Meanw...
What is the difference between git and cvs version control systems? I have been happily using CVS for over 10 years and have been told that GIT is much better. Could someone please explain what the difference between the two is and why one is better than the other? ...
When does one use git rebase vs git merge? Does one still need to merge after a successful rebase? ...
The description is a bit terse. I simply added a file on my local master branch and pushed it back to a remote repo. Any idea why this is coming up? warning: updating the current branch warning: Updating the currently checked out branch may cause confusion, warning: as the index and work tree do not reflect changes that are in HEAD. wa...
I've taken the following steps so far: 1) Cloned a remote Git repo 2) Branched the master branch to an experimental 3) edited/tested/committed code in the experimental branch Now, I'm not ready to merge experimental into master. I do however want to push it back to the remote repo as that's the repository I share with a few colleagues....
I am trying to check in a folder which contains few more folders inside it. How do I check them in recursively using SourceOffsite? If I select a parent folder, only the files gets checked in. Thanks ...
Hi there, We migrated from VSS to TFS about 6 months ago. Our way of storing projects was that we grouped them by category (Windows App, Web App, Infopath, SQLScripts, deprecated). Under the 'Windows App' workspace we might have 3 .NET projects. The 'Web App' might have 3, etc, etc. VSS was used more just to store the code repository ...
Hi all, I have a project which contains different components that everyone works on. We have a server-side component, and N amount of client components that interact with the server. I myself am responsible for one of the client components. I'm at a point where I'd like to branch off to develop new features for the client. The problem...
At work we're developing a large-scale application with quite a few front-end, back-end and support components. Typically the front-end is developed in C# and the back-end is developed in Java, although parts of the back-end are also developed in C# and possibly later C++. The choice of language and platform is not arbitrary; we try to ...
I've been using SVK without any issues the last 6 months. I then attempted to commit a file, when the following error occurred: %> svk commit -m "Message" foo/bar/file.txt Commit into mirrored path: merging back directly. Merging back to mirror source file:///usr/local/svn/repo. A checksum mismatch occurred: Base checksum mismatch on '/...
Hey everyone, I have a local git repo which I recently made a commit to, then pushed to a shared repo. Only after I pushed it to the shared repo did I realize I made an ugly mistake. I amended it locally no problem after I fixed my source with: git commit -C HEAD -a --amend After that, I tried another git push origin and I get the fo...
On the development shop I work for, we have an internal MAVEN repository, to keep our libraries (proprietary & open-souce). A common problem that we face is that, sometimes, the open-source libraries in our local MAVEN repository gets obsolete. Is there an automatic way to keep all the open-source libraries I use in my MAVEN repository a...
I use Visual Studio 2005 and I wanted to setup Visual Source Safe 8.0. I run the setup and It works properly I can access VSS administration tool and visual source safe via start menu. But, I can not see File / Source Safe menu in my Visual Studio 2005. Does anyone know how can I interact my visual source safe and visual studio ? SO...
I've never really worked with a lot of people where we had to check out code and have repositories of old code, etc. I'm not sure I even know what these terms mean. If I want to to start a new project that involves more then myself that tracks all the code changes, does "check out" (again, don't know what that means), how do I get star...
Duplicates: http://stackoverflow.com/questions/740053/why-should-i-use-git-instead-of-svn http://stackoverflow.com/questions/161541/svn-vs-git http://stackoverflow.com/questions/871/why-is-git-better-than-subversion I'm sure I've asked it wrong but I read that Git doesn't use a central repository like SVN does. One, I don't underst...
I'm currently working in a team where we're "using" a subversion repository. I say "using", because in reality, everyone's just editing files directly on a server through samba shares, while every once in a while our architect does a commit from that server with our changes, which are then pushed out to servers. So basically we're missi...