what does *~ mean in glob?
What is the meaning of *~ in glob syntax? For example, in a sample .hgignore file: syntax: glob .DS_Store *.swp *~.nib what is difference between a *~.nib and *.nib ? Thanks ...
mercurial
Mercurial: include revisions in git diff?
Is there some way to ask Mercurial to show the revisions being diffed in the output when using git mode? For example: $ hg diff -r trunk:development diff -r 08d51ecf22cf:ff5673e55b9f --git a/foo.c b/foo.c ... Or something similar? I've found that there have been a few times that I've taken a diff (eg, to review), but have later been ...
Merging from another clone with my own clone before pushing to main clone?
Hi, I am working on a project being version controlled by mercurial. I have a clone. My friend has a clone. My friend made some changes to his clone, and then pushed them to the main clone. I have made some changes to my clone, and am ready to push to the main clone. However, I want to incorporate his changes into my own clone, before...
Named previously unnamed branch
It seems naming a previously unnamed branch doesn't really work out. It creates a nasty multiple heads problem that I can't find a solution for. Here is the workflow... UserA starts working on feature that they expect to be small, so they just start working(off the default branch). The change turns out to be a large project and will ne...
Mirroring Subversion Repository In Mercurial with commit access
My team wants to begin a trial run of using Mercurial on our existing codebase stored in a Subversion repository. We want to have some developers use a Mercurial mirror of the subversion repository and have the rest of the team continue to use the existing Subversion repository. I've come across articles like, SubversionToMercurialSync...
Mercurial and Hudson on web hosting. Can I install Mercurial
Hi, I have a hosting package where I have a private Tomcat and I run Hudson. I wanted to start using Mercurial and BitBucket (which is fantastic btw), my problem is that Hudson or the Mercurial plugin doesn't bundle Mercurial in the same way it does Subversion and you have to point your plugin to your Mercurial install. My hosting does...
Using Mercurial to manage dependencies as nested repositories
I'd like to be able to manage my app dependencies in Mercurial such that inside my app I have a fork/clone of the dependency repository. I'd like to make and commit changes to the dependency repository inside the app, but still pull and merge changes from the dependency's primary repository. Pushing my app should push the dependency repo...
Does mercurial-server support subrepo?
I installed mercurial-server on one of my machines, cloned my project there, it has 3 subrepos, and when I try to clone it back to another location I get an error: remote: mercurial-server: Cannot create repo under existing repo abort: no suitable response from remote hg! So I'm starting to think that mercurial-server does...
Which is better for VS2010, VisualHG or hgscc (64 bit install)?
Simple question, have you used them, which do you prefer? Do either of them display the current branch in an easy to see place? Edit: If you have a preference, please let me know why. It is crucial in making an educated decision. ...
Using Git or Mercurial, how would you know when you do a clone or a pull, no one is checking in files (pushing it)?
Using Git or Mercurial, how would you know when you do a clone or a pull, no one is checking in files (pushing it)? It can be important that: 1) You never know it is in an inconsistent state, so you try for 2 hours trying to debug the code when your code is in a inconsistent state. 2) With all the framework code (such as Ruby on Rails...
Can GIT, Mercurial, SVN, or other version control tools work well when project tree has binary files?
Sometimes our project tree can have binary files, such as jpg, png, doc, xls, or pdf. Can GIT, Mercurial, SVN, or other tools do a good job when only part of a binary file is changed? For example, if the spec is written in .doc and it is part of the repository, then if it is 4MB, and edited 100 times but just for 1 or 2 lines, and chec...
Can Git or Mercurial be set to bypass the local repository and go straight to the central one?
Using Git or Mercurial, if the working directory is 1GB, then the local repository will be another 1GB (at least), residing normally in the same hard drive. And then when pushed to a central repository, there will be another 1GB. Can Git or Mercurial be set to use only a working directory and then a central repository, without having 3...
How to embed revision information using mercurial and maven (and svn)
Our project had a nice hack (although I'm guessing there are better ways to do it) to embed revision information into the artifacts (jar etc.) when we used svn. Now we have migrated to mercurial, and we want to have a similar thing, but before I start working on a similar hack with mercurial, I wanted to know if there are better ways ...
As of right now, on Windows 7, does Mercurial start up a server much simpler than Git?
On Windows 7, from reading hginit.com, it seems like it is very easy to set up a Mercurial server? mkdir repo cd repo hg init hg serve and that's it? Now http://localhost:8000 is the server. It seems that it is quite a bit harder to set a Git server up, either for Cygwin and mysysGit? Git for sure will make it simpler, maybe just n...
DeprecationWarning when pushing to Mercurial repo
I'm trying to serve a merurial repository with apache, and when I try to push to the repo I see this in the apache error.log. On the client side I get a 500 error. How do I get this to go away???? [Sun Jun 06 14:43:25 2010] [error] [client 192.168.1.8] /var/lib/python-support/python2.6/mercurial/hgweb/common.py:24: DeprecationWarning:...
How to create an alias for a mercurial user ?
I am looking for a way to create an alias for a user that has commited to a mercurial repository. For example, if there is a user named user1 I'd like every commit done by him to be under the name user2. ...
Mercurial hg clone error - "abort: error: Name or service not known"
I have installed the latest hg package available for Fedora Linux. However, hg clone reports an error. hg clone http://localmachine001:8000/ repository reports: "abort: error: Name or service not known" localmachine001 is a computer within the local network. I can ping it from my Linux box without any problems. I can also use the...
TortoiseHg : Can commit by command line but not with contextual menu
I just installed TortoiseHg (and I'm new to mercurial). I haven't been able to execute any commit with the contextual menu from Tortoise. Every time I try, I get the following error : Commit : Abort : The system cannot find the specified file. I get the error no matter the changes in my repository : new files, modifications to exis...
Mercurial, do I need a server for team-work or can I just create a repository on a network share?
If I want to set up a smallish Mercurial repository for some internal work among a few developers, can I just navigate to a network share and create a repository there, and then just clone that down locally? Or do I need to set up a server (I know, it's easy to do). This is Windows by the way. Specifically, I'm wondering if there will ...
Undoing branch creation in Mercurial
How can I undo the creation of a branch in Mercurial? For example, if I issue the command hg branch newbranch How can I delete this branch if I decide I entered the wrong name? I'm guessing this must be pretty simple to do, but I have yet to figure it out. Thanks! ...