Comments on: Mercurial Head Scratcher http://jbowes.dangerouslyinc.com/2007/02/09/mercurial-head-scratcher/ Purveyor of Pre-eminent Programmes Thu, 28 Aug 2008 23:32:07 +0000 http://wordpress.org/?v=2.5.1 By: Mercurial user http://jbowes.dangerouslyinc.com/2007/02/09/mercurial-head-scratcher/#comment-13157 Mercurial user Wed, 01 Aug 2007 07:09:12 +0000 http://jbowes.dangerouslyinc.com/2007/02/09/mercurial-head-scratcher/#comment-13157 It's actually not so different in Mercurial. You do your development on a named branch, and you import the work from the master repository on another, like so: hg diff -r my-branch -r master The one irritating gotcha is that the default branch isn't named by default, and unless you have added a name to it, you don't have any obvious way to select it (it's not always 'tip'), and have to search through the log for that revision. But the named branches are separate, and the above is equivalent to 'git diff master'. It’s actually not so different in Mercurial. You do your development on a named branch, and you import the work from the master repository on another, like so:

hg diff -r my-branch -r master

The one irritating gotcha is that the default branch isn’t named by default, and unless you have added a name to it, you don’t have any obvious way to select it (it’s not always ‘tip’), and have to search through the log for that revision. But the named branches are separate, and the above is equivalent to ‘git diff master’.

]]> By: James Bowes http://jbowes.dangerouslyinc.com/2007/02/09/mercurial-head-scratcher/#comment-17 James Bowes Mon, 12 Feb 2007 02:20:50 +0000 http://jbowes.dangerouslyinc.com/2007/02/09/mercurial-head-scratcher/#comment-17 The Cobbler Team would be wise to do so. Has the Cobbler Executive Software Configuration Management Steering Committee produced any reports yet? The Cobbler Team would be wise to do so. Has the Cobbler Executive Software Configuration Management Steering Committee produced any reports yet?

]]> By: Michael DeHaan http://jbowes.dangerouslyinc.com/2007/02/09/mercurial-head-scratcher/#comment-16 Michael DeHaan Mon, 12 Feb 2007 02:08:43 +0000 http://jbowes.dangerouslyinc.com/2007/02/09/mercurial-head-scratcher/#comment-16 The Cobbler Team is seriously considering moving to git. The Cobbler Team is seriously considering moving to git.

]]>