Issue the following command in your Acme repo. It adds a new remote repository named upstream that points to the Generic repo. git remote add upstream https://location/of/generic.git You can then merge any changes made to Generic into the current branch in Acme with the following command: git pull upstream If you just want it to … Read more
I too have been looking for a case where, say, Subversion fails to merge a branch and Mercurial (and Git, Bazaar, …) does the right thing. The SVN Book describes how renamed files are merged incorrectly. This applies to Subversion 1.5, 1.6, 1.7, and 1.8! I have tried to recreate the situation below: cd /tmp … Read more
incoming isn’t quite a direct mapping in git because you can (and I often do) have multiple repos you’re pulling from, and each repo has multiple branches. If there were an equivalent of hg’s incoming command, it’d probably be this: git fetch && git log ..origin/master That is, “go grab all of the stuff from … Read more
There’s a new git-remote-hg that provides native support: Bridge support in Git for Mercurial and Bazaar Just copy git-remote-hg to your $PATH, make it executable, and that’s it, no dependencies (other than Mercurial): git clone hg::https://www.mercurial-scm.org/repo/hg/ You should be able to push and pull from it as if it was a native Git repository. When … Read more
VonC has the answer you’re looking for, the Rebase Extension. It is, however, worth spending a second or two thinking about why neither mq nor rebase are enabled by default in mercurial: because mercurial is all about indelible changesets. When I work in the manner you’re describing, which is nearly daily, here’s the pattern I … Read more
Update to the stiging branch and create a new branch off of it. Then close the old branch. In summary: hg update stiging hg branch staging hg commit -m”Changing stiging branch to staging.” hg update stiging hg commit –close-branch -m”This was a typo; use staging instead.” hg push –new-branch
Here’s the cheat sheet on the commands: hg update changes your working copy parent revision and also changes the file content to match this new parent revision. This means that new commits will carry on from the revision you update to. hg revert changes the file content only and leaves the working copy parent revision … Read more
KDiff3 open source, cross platform Same interface for Linux and Windows, very smart algorithm for solving conflicts, regular expressions for automatically solving conflicts, integrate with ClearCase, SVN, Git, MS Visual Studio, editable merged file, compare directories Its keyboard-navigation is great: ctrl-arrows to navigate the diffs, ctrl-1, 2, 3 to do the merging. Also, see https://stackoverflow.com/a/2434482/42473
Disclaimer: I use Git, follow Git development on git mailing list, and even contribute a bit to Git (gitweb mainly). I know Mercurial from documentation and some from discussion on #revctrl IRC channel on FreeNode. Thanks to all people on on #mercurial IRC channel who provided help about Mercurial for this writeup Summary Here it … Read more
These articles may help: Git vs. Mercurial: Please Relax (Git is MacGyver and Mercurial is James Bond) The Differences Between Mercurial and Git Edit: Comparing Git and Mercurial to celebrities seems to be a trend. Here’s one more: Git is Wesley Snipes, Mercurial is Denzel Washington