W3C home > Mailing lists > Public > public-svg-wg@w3.org > July to September 2012

Re: must update your svg2-tools repository!

From: Brian Birtles <bbirtles@mozilla.com>
Date: Wed, 22 Aug 2012 12:48:01 +0900
Message-ID: <50345671.6050407@mozilla.com>
To: Chris Lilley <chris@w3.org>
CC: public-svg-wg@w3.org
(2012/08/21 23:28), Chris Lilley wrote:
> On Tuesday, August 21, 2012, 1:06:13 AM, Brian wrote:
...
> BB> hg pull -u
>
> OK that was indeed it (Mercurial newbie)

It's probably worth pointing out for those who are more familiar with 
git, that if you want to have local changes and combine them with 
upstream changes without adding a separate merge changeset, the rebase 
extension is pretty handy.[1]

It ships with mercurial, you just need to enable it. Then you can do:

   hg pull --rebase

which updates as well.

Apparently it goes a bit against the Mercurial philosophy of indelible 
changesets[2] but you might find it helps, especially if you're used to git.

Another approach is to manage patch queues (mq extension) but it's a bit 
more of a hassle when you're just doing minor spec tweaks.

Brian

[1] http://mercurial.selenic.com/wiki/RebaseExtension
[2] http://stackoverflow.com/a/2672489/901696
Received on Wednesday, 22 August 2012 03:48:32 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Wednesday, 22 August 2012 03:48:33 GMT