Hi friends, Here is a real version control system dummy! proper new starter! The way I have worked so far: I have a Drupal-6 web project www.blabla.com and making development under www.blabla.com/beta . I'm directly working on blabla.com/beta on server. nothing at my local, nothing at anywhere else. Only taking backup to local, time...
I'm in this kind of situation: i'm working with a remote developer on a cakephp website. He works on a local copy (php etc..) and updates a staging server. I usually do directly the edits (mainly css and text changes) on the remote staging server because I can't run a local copy of the website. What do you suggest for a SVN environment...
Hi, I am using subversion for version control of my code (tortoise SVN on windows and VisualSVN as the server on another computer). Things are going great as far as keeping different versions of my code is concerned, with necessary logs etc. Sometimes I make a few non-essential/trivial changes to the code and commit them before leaving....
I was wondering, are there any ways in which specific languages (C++, Java, Python, Haskell, etc) are especially suited more to one VCS than others? Maybe due to syntax or other factors? Or should choosing a VCS always be unaffected by such concerns? ...
Hello, I'm trying to get into Python and, more specifically, Zope and Plone. I read the book Professional Plone Development and one thing it says is that one MUST use version control. But the book did not expand on that topic any further. This leads to two questions. First: SVN or git? (My research points to git, if only to learn it. I'...
Does hg, svn or others have an option like git stash? ...
I get this error in realtion to my [username].mode1v3 package file: Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed (details follow): I can do a compare from the SCM results menu on this file. Doing so reveals 102 conflicts (differences) between my local copy and the l...
Does anyone know of a built-in way to have Hudson keep track of how many files are changed, added or deleted in the source code repository in each build ? I'd like to plot the results in the same way that the JUnit test results graphs show the numbers of passing and failing tests for each build. The Measurement Plots plugin and the Plo...
I'm having trouble managing my .dll references in projects in Visual Studio. All the registered .NET and COM references work fine but when it comes to .dll files on disk, if I refer to my files on disk, my colleagues will be missing references because they may have it in a different location on disk etc. Does Visual Studio have a environ...
Version Control noob alert I've already installed both Mercurial, TortoiseHg and VisualHG into Visual Studio 2010. I've set in Visual Studio my source control to Mercurial. When I right click on my solution, I already see HG's buttons in the context menu that appears there. My question now is, how do I make this version control thing...
Suppose you have a subversion repository with a directory /trunk/huge that is huge (thousands of files > 1G) and doesn't change very often. You check it out sparsely avoiding /trunk/huge, e.g. svn co --depth immediates ^/trunk trunk for f in trunk/*; do if [ "$f" != "trunk/huge" ]; then svn up --set-depth infinity $f; fi;...
Hi, We use subversion to keep track of our code, just sharing code between us two. However we encounter a problem when we both add or remove file at the same time before the next commit. It seems that whenever we mess with Groups & Files, project.pbxproj under the project package will be modified and subversion cannot take care of that....
Has anyone come across a Git or Hg plugin for "meaningful" diffs/merging/branching of OpenOffice or Microsoft word files. I know I can 'checkin' .doc files but both Git and Hg treat them as binary blobs. I'd like to be able to do all (or at least many) of the normal revision based operations on the text of the file. And yes, I do know...
What is the difference between vcalendar and icalendar? Is it only the VERSION difference as 1.0 and 2.0 respectively? For sending a Meeting Request with iCalendar and vcalendar, I specify the MIME type as text/calendar. The email sent with iCalendar appears as a Meeting Request while the one with vCalendar appears as an attachment. W...
Say I have revision A that's from a long time ago and made a desirable change. Then, later on, I had revision B which made lots of changes to lots of files, including wiping out change A. Now, much later, I want to re-apply revision A. Is there a good way to do this? The merge and cherry-pick commands seem to skip revisions that are ...
I have a repo where I'm seeing behavior that I don't understand. Ill refer to the repo that this is occuring on as the 'bad repo', all of the following sequences were run on that one. It doesn't matter what commit I reset to, same conflicting behavior. The files it reports as conflicting seem to be the ones that were changed in the co...
We have a VMWare image running a gforge instance in our local network. We would like some external folks to be part of the dev process. We would like to keep this repository as the master SVN repository. What kind of options are available for sharing the code with the external resources and merging it back into our local repository. Ot...
Hi, I've been playing around with git and hg lately and then suddenly it occurred to me that this kind of thing will be great for documents. I've a document which I edit in DOCX and export as PDF. I tried using both git and hg to version control it and turns out with hg you end up tracking only binary and diff-ing isn't meaningful. Alt...
I am completely switching for freelancing and I wanted to maintain my client codes in a Version Control system, ideally Git, SVN & Mercurial What’s is the best? ...
I have several projects on my development system - some projects are open source, and (herein lies the 'problem'), use their own revision control system (RCS). At last count, the different RCSs on my development machine are: CVS SVN mercurial git ... Its difficult enough, trying to remember and master the commands for a single syste...