mercurial

Mercurial repositories with many active developers?

I'm going through Bitbucket and I can't seem to find any Mercurial repositories that look like what I suspect our repository would look like, provided we switch to Mercurial. As such, I'm wondering, is there a workflow that we're not considering here? The thing I'm talking about is that I did a small automated test. We're 14 people tha...

Combine files on commit in Mercurial

I've got a project with 2 files I want to source-control using Mercurial: A SCX-File which is a binary (database) file A SCT-File which is a text file My filter: [encode] **.scx = tempfile: sccxml INFILE OUTFILE 0 [decode] **.scx = tempfile: sccxml INFILE OUTFILE 1 Problem sccxml only receives the path to the SCX-File The SCX-Fi...

Mercurial - how to push unfinished branches?

We converted everything to Mercurial coming from CVS and so far so good. An issue we encountered today though is this situation. Before the move to Mercurial I had a few pending changes from a while back, features that were started and later postponed for various reason. Odds are that someone else will finish those features months fro...

Google App Engine App.yaml config for skip-files to ignore Mercurial files

I have added a line at the top of skip_files to make app engine deployment skip all files starting with .hg such as the .hgignore file and the .hg directory. Will this ignore the whole .hg directory and all its files and subdirectories? skip_files: - ^(./)?.hg$ ^(.*/)?app.yaml ^(.*/)?app.yml ^(.*/)?index.yaml ^(.*/)?index.yml ^(./)?#....

Distributed Version Control "killer applications"

Considering switching to Mercurial? We are too. I'm currently studying the benefits of DVCS which turn out to be vast, lust and must. I would love to hear from the community typical usage patterns. Let's create a "Top (te)N" productivity feature list for DVCS (based on Mercurial, or alike). Please describe work flows that prove to be...

Migrate a folder from repository to another repository, with all the changes tree data

I have a folder in a mercurial repository, that I want to copy to another mercurial repository, but with all the changes that I made to this folder, and without losing the all version control that I did on this folder. Is that possible to do with mercurial? ...

Create a war file from a mercurial repository with maven

Hi, I have a mercurial repository on my server. I want to create a script to deploy the project as a war file to a tomcat server. Is it possible to tell maven to get the latest revision of my project from the repository and create a war file. Thanks ...

hg diff -g shows different output between a merge (pre-commit) and the change log (post-commit)

Hi all, I am using branches in our mercurial repository and have noticed renames done in separate branches are not shown pre-commit after merging to the default branch. However after a commit when you issue the hg diff -g command it shows the rename correctly. The following snippet shows what I mean. A new repository being created. I c...

Mercurial HG Archive subdirectory for web deployment

I've got a Mercurial repository that contains a subdirectory for design files and a sub directory for code files. What's the best way for me to deploy the code subdirectories on my server, keeping it secure, without deploying the design files? ...

How to make the Mercurial (hgwebdir) rss/atom feed display the branch name

I would like to configure our Mercurial server installation so the rss/atom feed will publish the branch name of the changeset, in addition to the standard fields (title, guid, description, author, pubDate). ...

How do you associate a named branch with a different changeset in Mercurial?

I converted a repository from Git to Mercurial, and created a named branch production for our production development. Unfortunately, a week later, we've just realized the production branch is on the wrong changeset. Although we've made a number of changes to the repository, there haven't been any commits to the production branch yet. ...

Mercurial: R with 'hg status', how to commit?

If I do 'hg status' and see the following: R flash/AC_OETags.js it seems to mean that there is no file there, but there has been one at some point that has been removed. How do I 'commit' this change so it stops showing up when I do 'hg status'? ==UPDATE== The answer seems to be to commit the file. Actually, there are ~100 files wi...

Are merges in Git different than in Mercurial?

Hopefully, this isn't a loaded question. I'm a longtime user of hg, and it's meeting our needs quite well. Lately I have been working with a consultant and he keeps going on about 'managing several repos and pushing/pulling/merging them is easier' than hg. More specifically, I believe he means that pushing changes to a remote repo is ...

hg remove directory from repo?

Hi I'd like to remove a directory and all the files in it from a repo. I have removed all the files with 'hg remove', but how do I remove the directory itself? Will it just automatically vanish once I commit all the removed files? thanks! ...

Mercurial premerge = false only for specific files, = true for all others?

Is it possible for Mercurial to automatically merge all changes except for specifically nominated files? For the specific files there are some lines that may be overwritten so I want it to force a manual merge with the visual merge tool. The use-case for this is pulling from a parent repo and building a different version of an app form ...

delete files in history to save some space in mercurial

ok, when I was young, I put severial big files(like resource file, dll, etc..) in my mercurial repos. and I found the size of it is so big that I cannot easily push it into bitbucket, any way to delete this files history EASILY? I put all those files in /res and /dll path. edit: this is a solution, but it will delete part of the hist...

Which continuous integration software do you use?

Google says there are: Hudson ( first impression: not lightweight ) Cruise control ( first impression: not lightweight ) Bitten ( seems to be dead, last ticket >8 months old) BuildBot But BuildBot seems a bit outdated, offering no statistics, not very intuitive to configure... Features we are interessted in are: Multi platform supp...

Creating a local transparent cache of a mercurial repository.

I have lots of different clones which I work on separately. When I want to update those clones, it can be quite slow to update them from the server. So instead I have a "clean" clone, which I update from the server regularly, and all the other clones clone from the clean clone (hope that makes sense). But now what I have is a two-step a...

What is the most efficient way to handle "hg import" rejects?

When I import a patch using hg import, the command sometimes creates .rej files. When a conflict occurs, is there a way to automatically launch the visual merge tool instead of creating the .rej files? If not, what is the most efficient workflow to process the .rej files? ...

For binary files should I use bfiles or bigfiles?

There are a few mercurial extensions for dealing with large binary files. Bfiles BigFiles Snap others? I'd like to use the one that is most likely to be official (ie distributed with mercurial). Kiln 2.0 uses a fork of Bfiles for its binary files. Does that make it more likely to become official? Which is the preferred (semi-offici...