When performing a merge with Mercurial, it wants to merge conflicting files one at a time which just isn't a productive workflow on large merge sets. Instead, what I would like to do is merge the entire changesets of both heads (like using kdiff3 to diff 2 heads). To me that sounds straightforward but I can't figure out how to achieve ...
Converting a repository from Git to Mercurial results in a load of spurious "committer:" lines in each log message. I can't figure out a way to not generate these. If I convert a SVN repository, these lines aren't added. It seems to be a git thing only. This is easy to test. Here's how on Linux: mkdir repo && cd repo git init echo hell...
I'm forced to use Visual Source Safe 2005 at work. I'd like to combine that with a DVCS, so that I can check in files locally without disrupting my co-workers if there's a bug or it doesn't compile. In my attempts with Mercurial, it works, but causes a few weird issues. Namely, it thinks someone else has checked out the files I have che...
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...
I can't clone my repository via http: abort: 'http://MYREPO' does not appear to be an hg repository! Firstly, I created a new repo by hg init MYREPO followed by adding some file and commit. The dir with my repo is password protected but there is no sign of problem because of it, I tried both methods of cloning: (on my local machine) ...
I've been looking all over for decent instructions on how to get hgwebdir working on IIS but I haven't found much of worth. There's this "step by step" on the Mercurial wiki, but it's not very good. There's also this and this, but again, I can't find good steps to lead up to where those get started. ...
This seems like it should be obvious but I can't figure it out. Suppose I have mercurial revisions 4 and 7 and I want to see which files changed between those revisions. I can do a hg diff -r 4 -r 7 to list the entire set of diffs... is there a way to just list the files that have changed? ...
A similar question has been asked recently, but is not the same. The Mercurial website has a detailed page listing comparisons for 4 different options for getting Mercurial and Subversion to interoperate. I am wondering if anyone out there has tried one or more of these, and could relate any really good or really bad experiences. The n...
I'm interested in trying out distributed version control systems. git sounds promising, but I saw a note somewhere for the Windows port of git that says "don't use non-ASCII filenames". I can't find that now, but there is this link. It's put me off git for now, but I don't know if the other options are any better. Support for non-ASCII ...
I'm using Mercurial for personal use and am conteplating it for some distributed projects as an alternative to SVN for various reasons. I'm getting comfortable with using it for self contained projects and can see various options for sharing however I haven't yet found any guidance on managing common libraries to be included in multiple...
Mercurial supports push-style cloning of repositories to remote hosts, however newly cloned repositories don't contain working copies. Is there any 'hidden' option to make mercurial call update upon these cloned repos? Here is an example: 1) hg init hello 2) hg clone hello ssh://somehost/hello ssh://somehost/hello only contains .hg ...
I'm using both mercurial and git for different projects and like them both. What I find a bit annoying about mercurial is that "hg status" shows paths relative to the repository root, not to the current directory(unlike git). Can this behaviour be tweaked somehow? ...
Hey, I have just begun working on a project which uses Mercurial as a version control system, and I need some basic tips on how to use this. Please use this question to give some introductory tips on this technology. The official Mercurial site Especially, I am looking for tips on the best programs to use and the best techniques to ...
I need to write a shell script to be scheduled to run daily to backup a directory using mercurial. I have got most of the use cases done except I can figure out a way to do automated login while the script is running. for REPOSITORY in $@ do cd $REPOSITORY # commit the changes hg commit -A -m "Commit changes `date`" #...
Let's suppose we have a subversion repository which looks like /original/0.1 /original/0.2 /variantA/trunk /variantA/branches/who/branch_for_xxx /variantA/branches/she/branch_for_yyy /variantB/trunk /variantB/branches/who/branch_for_zzz (... 30 or 40 alike) where variantA and variantB are forks of the original software. I am looking ...
this is a small addition to the previous script, and this time I would like to log details for the backup. script /tmp/commit-push-log # add all files to the repository for REPOSITORY in $@ do cd $REPOSITORY # commit the changes hg commit -A -m "Commit changes `date`" # push the changes to the remote repository ...
I'm using Mercurial for development of quite a large C++ project which takes about 30 minutes to get built from the scratch(while incremental builds are very quick). I'm usually trying to implement each new feature in the new branch(using "hg clone") and I may have several new features developed during the day and it's quickly getting ...
This should be a very simple thing to have run, but for some reason it won't work with my Mercurial repository. All I want is for the remote repo to automatically run hg update whenever someone pushes to it. So I have this in my .hg/hgrc file: [hook] changegroup = hg update Simple, right? But for some reason, this never executes. I al...
I want to create a .NET client for mercurial. Nothing fancy, just the basic stuff. ...
I'm looking for a tool to migrate a couple of SVN repos to Mercurial, with history, labels and so on. I'm Using TortoiseHg (Windows x32), so ConvertExtensions are discarted. There's some info on how to do this process on a Linux box (hgsvn) I don't have a Linux machine available. Can I use those python scripts on windows? If so, wha...