I've seen a lot of advice about Git workflow, but it wasn't extremely usable for us. I'd like to get a piece of advice with respect to our situation. We are a very small web-development company from Russia. A lot of our orders are small web-sites for firms or events. It adds some specifics to our workflow. A "release" or "version" mak...
I am trying to move from Netbeans to Eclipse. Minor thing bothering me is that Eclipse dosen't seem to have the kinda edit highlighting that Netbeans does. For example, a new line is automatically highlighted as green. An edit is highlighted as blue. And this happens in an unobtrusive way on the left along with the line numbers( if li...
Say I commit some changes to a new local named branch called 'X'. Then I commit some other changes to my 'default' branch. Can I push only the changesets on 'default', but not the changes on 'X'? Might my approach be wrong? If so, please offer criticism. ...
I'm writing my blog system(django), and my blog files are VCSed by mercurial, I want get files create/update time, how could I do this by using commandline or python? edit: this is a example: $ SOME_COMMAND xxx.txt 2010-12-13-04:12:12 2010-12-14:04:12:12 xyx.txt 2010-12-13-04:12:12 2010-12-14:04:12:12 xxy.txt 2010-12-13-04:12:12 2010-...
I'm trying to use MacVim as a default editor (on my Mac, obviously). I'd like to have MacVim to edit commit messages when I hg ci. Unfortunately when I do so (either by setting EDITOR=mvim or alias vi='mvim') MacVim pops up with an empty message (i.e. none of the boilerplate in the bottom half), and when I save that commit message I get ...
Because I used to always do hg vdiff -r -2:-3 hg vdiff -r 5213:5212 are all the hg commands exactly the same using those, vs using hg vdiff -c -2 hg vdiff -r 5213 ? ...
Hello, I have a problem with the PATH variable on Debian Linux when executing commands via SSH. This happens for example when I use GIT or Mercurial and I have them installed in /opt instead of /usr/local. But I can also reproduce this easily like this: When I login to the server via SSH in a normal way and then do echo $PATH then I ge...
We are looking at moving away from Perforce (mostly due to the pain of having to always be connected to its sever and the lack of support for moving bug fixes between branches, and also wish to introduce a tool for code reviews) However we still need all the history that is in Perforce, so is there a way to move to Kiln while keeping th...
Is there a way to prevent closed branches from showing up at the top when running the hg view command? I know about the 'limit' option. I don't really need closed branches to completely disappear from the view, but it would be nice if they would stay down (they were closed long ago), rather than popping up near the top every time I per...
I'm using Windows XP with installed Mercurial TortoiseHg on it. Now I need to install the external activity extension. I downloaded the extension and enabled it in hgrc. When I'm try to call it using command: hg activity I receive the following error: There are 292 changesets Hg activity options: you need matplotlib in your python p...
Let's say I create a repository, add x files to it and commit. Say the size is a Mb after the initial commit. Is there any way to estimate how large the repository is going to be in one years time? If the lines of code has increased by 10%, will the repository have grown accordingly? How does number of commits, branches, tags etc. fac...
I've been pushing my source to a Mercurial repository. Today I needed to delete my local copy and re-clone. I did this by simply moving my local copy somewhere else (just in case) and typing "hg clone url". This part has worked just fine. However, when I try to pull the newly cloned local copy into Eclipse, I get the following error:...
I've been trying to set up a project using bitbucket which has project dependencies hosted on github. Using the Hg-Git Mercurial plugin I am able to almost get there. But when it comes time to push, things become troublesome. The documentation for Mercurial subrepositories states: 2.4 Push Mercurial will automatically attempt ...
Does Git have anything like Hg's HGRCPATH, i.e. an enviromental variable which you can modify to change the location where Hg will search for its global configuration file. In git that can be somewhat accomplished by changing HOME, but that will affect unknown number of other applications, which is why I'm trying to avoid it. ...
I'm looking for a Mercurial C# API. The only one i can find goes to a 403 page on google (http://code.google.com/p/mercurialdotnet/). Does anyone know of one that I can use? ...
If I look at Mercurial's site, it seems to tell me to use update -C to switch between branches. Another Stack Overflow answer says to use checkout instead. What are the differences? It seems to me that checkout updates the files in the working directory to the branch too, like update -C. ...
Let's assume that we have the next directory structure: /parentdir/ /childdir/ child_file1.txt child_file2.jar file1.txt file2.txt so, we get next full file names: /parentdir/file1.txt /parentdir/file2.txt /parentdir/childdir/child_file1.txt /parentdir/childdir/child_file2.jar Which regular expression matche...
$ hg status M ... M ... M ... ? ... ? ... ? ... I add need all 'not-added' (?) files. Is it possible? I can do "hg add *" but I will get many messages unwanted 'file already tracked'. ...