<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	xmlns:atom="http://www.w3.org/2005/Atom"
	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
	xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
	>

<channel>
	<title>dougt&#039;s blog &#187; hg</title>
	<atom:link href="http://dougt.org/wordpress/tag/hg/feed/" rel="self" type="application/rss+xml" />
	<link>http://dougt.org/wordpress</link>
	<description>best. tagline. ever.</description>
	<lastBuildDate>Mon, 26 Jul 2010 03:18:35 +0000</lastBuildDate>
	<language>en</language>
	<sy:updatePeriod>hourly</sy:updatePeriod>
	<sy:updateFrequency>1</sy:updateFrequency>
	
		<item>
		<title>how i made the 192 pushlog ugly</title>
		<link>http://dougt.org/wordpress/2009/09/how-i-made-the-192-pushlog-ugly/</link>
		<comments>http://dougt.org/wordpress/2009/09/how-i-made-the-192-pushlog-ugly/#comments</comments>
		<pubDate>Thu, 01 Oct 2009 02:52:49 +0000</pubDate>
		<dc:creator>dougt</dc:creator>
				<category><![CDATA[mozilla]]></category>
		<category><![CDATA[hg]]></category>

		<guid isPermaLink="false">http://dougt.org/wordpress/?p=494</guid>
		<description><![CDATA[in other words, how i screwed up a hg push. I wanted to push changes from mozilla-central to mozilla-1.9.2. The standard way is to: ============================================================= how to apply a m-c committed patch to a release branch ============================================================= hg qimport http://hg.mozilla.org/mozilla-central/raw-rev/ hg qpush hg qref -e # add approval information hg qfin . hg push What [...]]]></description>
			<content:encoded><![CDATA[<p>in other words, how i screwed up a hg push.  I wanted to push changes from mozilla-central to mozilla-1.9.2.  The standard way is to:</p>
<blockquote><p>
=============================================================<br />
how to apply a m-c committed patch to a release branch<br />
=============================================================<br />
    hg qimport http://hg.mozilla.org/mozilla-central/raw-rev/<changesetid><br />
    hg qpush<br />
    hg qref -e # add approval information<br />
    hg qfin .<br />
    hg push
</p></blockquote>
<p>What I did was basically the same thing, with a few shortcuts (insert your favorite story about how cutting corners can cause harm).</p>
<p>Basically I started out with a bug report.  It has the information about what it fixed, who reviewed it, who approved it, etc.  The first thing to do is verify that it all checks out and is a reasonable thing to do.  In the bug, there usually a comment with the hg changeset information.  Here was my first shortcut; I copied the url to the html version of the changeset from the bug, and run the qimport command.  `hg qimport` has no problem with importing that patch (which should probably generate an error, but anywayz).  What this did was imported a big html file &#8212; not what I wanted at all.</p>
<p>I then jumped over the `hg qref -e` command.  This would have allowed me to see the changeset&#8217;s original comment.  I would have been able to see that the qimport terribly failed.  Also, this is a good idea to do so that you can add the appropriate a=foopy approval flag(s).</p>
<p>The last shortcut I took was I didn&#8217;t do a sanity check by running `hg out -p` which would have shown me what I was pushing.  This is always a good idea to see what you are pushing.  Sure reliance on the tools is fine and dandy, but actually seeing what hg thinks it is going to push doesn&#8217;t hurt and only takes a few seconds.</p>
<p>3 shortcuts resulted in a skidmark on the 191 push log:</p>
<p><a href="http://hg.mozilla.org/releases/mozilla-1.9.2/rev/739c7a69d412">http://hg.mozilla.org/releases/mozilla-1.9.2/rev/739c7a69d412</a><br />
<a href="http://hg.mozilla.org/releases/mozilla-1.9.2/rev/1898753917d5">http://hg.mozilla.org/releases/mozilla-1.9.2/rev/1898753917d5</a></p>
<p>Sure there are worse things (e.g. patch bomb, pushing without testing, breaking trees), but I thought I would write this up both for clarification of how I messed up as well as a warning. <img src='http://dougt.org/wordpress/wp-includes/images/smilies/icon_smile.gif' alt=':-)' class='wp-smiley' /> </p>
]]></content:encoded>
			<wfw:commentRss>http://dougt.org/wordpress/2009/09/how-i-made-the-192-pushlog-ugly/feed/</wfw:commentRss>
		<slash:comments>3</slash:comments>
		</item>
	</channel>
</rss>
