Possible Duplicate: Merging: hg/git vs. svn Hi, I'm a long time SVN user and have been hearing a lot of brou ha ha with regard to mercurial and decentralised version control systems in general. The main touted feature that I am aware of is that merging in Mercurial is much easier because it records information for each merge ...
I am trying to use the subrepo feature of mercurial, using the mercurial eclipse plugin\tortoiseHG. These are the steps I took: Created an empty dir /root cloned all repos that I want to be subrepos inside this folder (/root/sub1, /root/sub2) Created and added the .hgsub file in the root repo /root/.hgsub and put all the mappings of ...
VisualSVN server is a nice piece of software; particularly in that it uses the builtin Windows authentication mechanism on my server. I'd like to try to start using Mercurial though, and I'd like to keep the Windows authentication scheme. Is there some way to set this kind of thing up using the tools available on Windows Server 2008 R2 ...
I'm assuming Mercurial is for having an updated website and it archiving the old stuff? Easy to test things and such? My question is, how exactly should I get started and can somebody give me a crash course in using Mercurial and using the following techs below: Notepad++ for coding FTP PHP/MySQL Jquery & other js libraries I use win...
I would like to mark an arbitrary group of commits/changesets with a label. Commit 1 *Mark 1 Commit 2 *Mark 2 Commit 3 Commit 4 *Mark 1 Commit 5 *Mark 2 The goal is to easily locate all the changes for a specific mark, and to have that grouping persisted in the VCS directly, as opposed to some outside system like a bug tracking sy...
Hi, I did a hg update --force <repo> hg pull --update --force <other repo> to get another seemingly unrelated repository into the current one. Afterwards I merged the first changeset of the other repo (to get renamings "right"). A rebase of the other repository starting from the second changeset left the first changeset (here: revisio...
TortoiseHg adds a "ms" (merge status?) column after doing a merge which indicates 'R' or 'U'. What is the equivalent command line command? ...
Hello, I have written a simple framework (actually collection of libraries) and a number of applications based on that framework. These framework and applications both have their own mercurial repositories. When I update the framework repository, I copy all framework files to application folders one by one. This work flow causes me some...
I've read a lot about Mercurial and branching in it, however, I am still very much a version control newbie. I'm currently working on a project, where I have been tasked to work on a new module. I have a "main" repository, which contains the latest code from the rest of the project, and a cloned repository (call it "task") where I am d...
I was reading http://www.kernel.org/pub/software/scm/git/docs/gitignore.html and the 6 points used to explain the ignore patterns seem to be describing a custom variant of a glob search syntax. I am more familiar with Mercurial, which allows to explicitly ignore via glob or regex patterns, no questions asked. Is there any similar funct...
The command hg outgoing compares the local repo to the default push location; it accesses the push location to do it. I'd like to ask the question "have I checked in changes in my local repo since my last hg push?" without having to access the remote repo. It seems like there might be enough info in the local repo to figure that o...
Let's say you do hg status and you have three files modified. I know how to check in all three files (hg commit). But how can you check in (and then hg push) just one of the modified files? ...
In clearcase If I am working on some file X and want to also see its previous version(say version 5) it is available as X@@/main/5. Is something similar available with other (preferably free) version control systems? HG has hg cat and hg co. but they still do not come close to clearcase's feature above... Regards Vijay ...
The Story After cleaning up my Dreamhost shared server's home folder from all the cruft accumulated over time, I decided to start afresh and compile/reinstall Python. All tutorials and snippets I found seemed overly simplistic, assuming (or ignoring) a bunch of dependencies needed by Python to compile all modules correctly. So, starting...
Hi Everyone, For version control we currently use Visual Source Safe and are thinking of migrating to another version control system (SVN, Mercurial, Git). Currently we use Visual Source Safe's "Shared" file feature quite heavily. This allows us to share code between design and runtimes of a single product, and between multiple product...
I recently tried to merge a series of changeset and encountered a huge number of merging issues. Hence I'd like to to try to apply each changeset, in order, one by one, in order to make the merging issues easier to manage. I'll give an example with 4 problematic changesets (514,515,516 and 517) [in my real case, I've got a bit more than...
Before explaining my problem let me tell you the Mercurial setup, We have the following repos, RELEASE DEVELOPMENT BUGFIX All the above repo are running on a central server using IIS and hgwebdir.cgi Now coming to the problem, I clone a local repo from DEVELOPMENT repo. I make changes to the clone and commit (Not push). I make a bu...
Ok I hope that this will end up sounding like a reasonable question. From what I understand of subversion if you have a repo that contains multiple projects, then you can branch individual projects within that repo (see SVN Red book - Using Branches) However what I don't quite follow is what happens when you create a branch in one o...
I have several projects which are shared between Windows and Mac. The dev machine is a Mac running Parallels: the files are stored on the Mac side, and the source is shared to the Windows side. This is very convenient, as I can switch back and forth between Windows and Mac tools rapidly without having to sync files. Recently I swit...
Allright I got myself in a deadlock with Mercurial and sub-repos... Here's what happenend: I had a large mercurial repo that I server via apache and hgweb.cgi. Due to the size of the repo I decided to move to sub-repositories and share these with hgwebdir.cgi. Using the convert tool with the filemap option I created several sub-reposito...