<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xml:base="http://mathews2000.com/drupal" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
 <title>Ben &amp; Sonia Mathews - </title>
 <link>http://mathews2000.com/drupal/frontpage</link>
 <description>The basic front page view.</description>
 <language>en</language>
<item>
 <title>Christmas Letter 2009</title>
 <link>http://mathews2000.com/drupal/ChristmasLetter2009</link>
 <description>&lt;p&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/hYQiPyMh35B_9GZCCs5cGg?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh5.ggpht.com/_1QSoMNgJOoY/SyhI2kF6qlI/AAAAAAAAAjM/l9ufkpxTCs0/s400/2009_03_21_12_40.jpg&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p&gt;Dear Family and Friends,&lt;/p&gt;
&lt;p&gt;We hope that this letter finds you and yours healthy and happy at the end of another busy year.  &lt;/p&gt;
&lt;p&gt;2009 has been an eventful year for the Mathews…  In May Ben’s father died after years of struggling with a brain injury, colon cancer, and other ailments.  We miss him and think of Grandpa often.  Sonia’s parents moved to Utah in October.  We enjoy having them close by.&lt;/p&gt;
&lt;p&gt;We love traveling and started off the year with a trip over Spring Break for Sonia and the children to visit her Sacramento family.  Our second trip was to Oregon in May to be with Ben’s father before he died and attend his funeral.  In July we went to Ben’s Barker family reunion.  This was Sonia’s first time attending in the nine years that we have been married.  We had a good experience and she especially enjoyed rafting down the Boise River as a family.  In October we went on this year’s big family vacation to Disneyland.  Grandma Mathews joined us.  We had an amazing time and Ben was a good sport!  &lt;/p&gt;
&lt;p&gt;Ben’s life seems to get busier by the year.  He spends his free time developing and maintaining a family history website, exercising, gardening, fulfilling his church responsibilities, and being a dad and husband.&lt;/p&gt;
&lt;p&gt;Sonia loves being a mother and home maker. Our children keep her busy with all of their activities.  She has lost 30 lbs. since August and really enjoys her Zumba class.  She volunteers regularly in church as a Relief Society teacher and as an Activity Day’s leader to the 8/9 year old girls.  A highlight this year was attending Women’s Conference in the spring.  She has almost completed the U.S. naturalization process.   She loves Canada, but feels her future is in the United States and wants to vote. &lt;/p&gt;
&lt;p&gt;Our children are growing and thriving and bring us joy.  Katrina, our eldest is eight years old and attends third grade.  This year, she has danced, swam, played soccer and sung in her school choir.  Katrina loves being active, playing with friends, cooking, baking, riding her bike, and reading.  We are proud of her accomplishments.&lt;/p&gt;
&lt;p&gt;Samuel started kindergarten this year.  He loves socializing and is learning to read. He has been involved in All-Sports classes, swimming, and soccer.  Samuel is loving and generous.  He wants to be in charge and tries to be a good leader.&lt;/p&gt;
&lt;p&gt;Sarah, our four year old princess, loves all the girly stuff.  She too has been involved in All–Sports, swimming, gymnastics, and dance.  She and I do a mommy-and-me preschool several times a week.  &lt;/p&gt;
&lt;p&gt;Andrei, Sonia’s brother, has been living with us for the last year.  He works at a Japanese restaurant and will be starting school at Utah Valley University in January.  &lt;/p&gt;
&lt;p&gt;Best Wishes,&lt;/p&gt;
&lt;p&gt;Ben, Sonia, and Children&lt;/p&gt;
&lt;p&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/UfpUv33-cq9SF6MHOFKRZQ?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh5.ggpht.com/_1QSoMNgJOoY/SyhI3Y4D98I/AAAAAAAAAjQ/0SRpfjNFQBc/s288/2009_10_11_18_37.jpg&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/FQgvKgbYupLKiKat8paIgA?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh5.ggpht.com/_1QSoMNgJOoY/SyhI32qtRDI/AAAAAAAAAkM/67D0E_WslqI/s288/2009_04_01_18_20-001.jpg&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/Ov2_4Nl7BKyruYWHTK7Axw?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh6.ggpht.com/_1QSoMNgJOoY/SyhI5WU4hLI/AAAAAAAAAkY/LPkz_V6Iekk/s288/2009_05_07_18_52-001.jpg&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/4jk5W13f7MQhum2fhkivuQ?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh4.ggpht.com/_1QSoMNgJOoY/SyhI6gWdpcI/AAAAAAAAAkg/SIsmTv--Ico/s288/2009_04_11_09_22.jpg&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/WYvXsn79jbllD5OUW4wehg?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh6.ggpht.com/_1QSoMNgJOoY/SyhI7s4j0KI/AAAAAAAAAko/cBcFQmoUNb8/s288/2009_10_10_18_55-002.jpg&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/FX2CasBvwRXeN2sw4DD2Cw?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh5.ggpht.com/_1QSoMNgJOoY/SyhI8PIAyAI/AAAAAAAAAk0/LEAVZuIO7q8/s288/2009_04_16_10_51-001.jpg&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/Kl60XiWKyuVd6Xo3I__VDg?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh6.ggpht.com/_1QSoMNgJOoY/SyhI8-_CWHI/AAAAAAAAAlA/hi99LRiaghU/s288/2009_05_01_11_02-002.jpg&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/MQ2n1nWztGzpS6qSIHBeSA?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh4.ggpht.com/_1QSoMNgJOoY/SyhI9bBGOVI/AAAAAAAAAlI/oRCTSCSAW1E/s288/2009_10_10_19_00-001.jpg&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;http://picasaweb.google.com/lh/photo/wQjfG7wkD3JhEmOW2k-ffA?authkey=Gv1sRgCITcp-nJz4WqlQE&amp;amp;feat=embedwebsite&quot;&gt;&lt;img src=&quot;http://lh3.ggpht.com/_1QSoMNgJOoY/SyhI9iXct3I/AAAAAAAAAlU/flkI6x1-XYY/s288/082.JPG&quot; /&gt;&lt;/a&gt;&lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/ChristmasLetter2009#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/13">Christmas</category>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <pubDate>Tue, 15 Dec 2009 18:08:34 -0800</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">225 at http://mathews2000.com/drupal</guid>
</item>
<item>
 <title>Pornography is really, really bad for you, your family, and your community</title>
 <link>http://mathews2000.com/drupal/node/224</link>
 <description>&lt;p&gt;We have been told by church leaders, sociologists, biologists, and family researchers for years how detrimental pornography is to an individual, his family, and community.  Despite these warnings, pornography is a &lt;a href=&quot;http://www.forbes.com/2001/05/25/0524porn.html&quot;&gt;1.8 billion dollar industry&lt;/a&gt; in the US.&lt;/p&gt;
&lt;p&gt;The Sutherland Institute has released a study that synthesizes all available research on pornography.  It finds that:&lt;/p&gt;
&lt;p&gt;THE FAMILY AND PORNOGRAPHY&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Married men who are involved in pornography feel less satisfied with their conjugal relations and less emotionally attached to their wives. Wives notice and are upset by the difference. &lt;/li&gt;
&lt;li&gt;Pornography use is a pathway to infidelity and divorce, and is frequently a major factor in these family disasters. &lt;/li&gt;
&lt;li&gt;Among couples affected by one spouse’s addiction, two-thirds experience a loss of interest in sexual intercourse. &lt;/li&gt;
&lt;li&gt;Both spouses perceive pornography viewing as tantamount to infidelity. &lt;/li&gt;
&lt;li&gt;Pornography viewing leads to a loss of interest in good family relations. &lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;THE INDIVIDUAL AND PORNOGRAPHY&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Pornography is addictive, and neuroscientists are beginning to map the biological substrate of this addiction.  &lt;/li&gt;
&lt;li&gt;Users tend to become desensitized to the type of pornorgraphy they use, become bored with it, and then seek more perverse forms of pornography. &lt;/li&gt;
&lt;li&gt;Men who view pornography regularly have a higher tolerance for abnormal sexuality, including rape, sexual aggression, and sexual promiscuity. &lt;/li&gt;
&lt;li&gt;Prolonged consumption of pornography by men produces stronger notions of women as commodities or as “sex objects.”  &lt;/li&gt;
&lt;li&gt;Pornography engenders greater sexual permissiveness, which in turn leads to a greater risk of out-of-wedlock births and STDs. These, in turn, lead to still more weaknesses and debilities. &lt;/li&gt;
&lt;li&gt;Child-sex offenders are more likely to view pornography regularly or to be involved in its distribution. &lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;OTHER EFFECTS OF PORNOGRAPHY&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Many adolescents who view pornography initially feel shame, diminished self-confidence, and sexual uncertainty, but these feelings quickly shift to unadulterated enjoyment with regular viewing. &lt;/li&gt;
&lt;li&gt;The presence of sexually oriented businesses significantly harms the surrounding community, leading to increases in crime and decreases in property values. &lt;/li&gt;
&lt;li&gt;The main defenses against pornography are close family life, a good marriage and good relations between parents and children, coupled with deliberate parental monitoring of Internet use.  Traditionally, government has kept a tight lid on sexual traffic and businesses, but in matters of pornography that has waned almost completely, except where child pornography is concerned.  Given the massive, deleterious individual, marital, family, and social effects of pornography, it is time for citizens, communities, and government to reconsider their laissez-faire approach. &lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;If you use pornography, stop.  If you know someone that uses pornography, help them to stop.  Go read the &lt;a href=&quot;http://sutherlandinstitute.org/newsletter/story.asp?n=154&amp;amp;s=383&quot;&gt;report&lt;/a&gt; now.&lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/node/224#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <pubDate>Fri, 04 Dec 2009 07:43:06 -0800</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">224 at http://mathews2000.com/drupal</guid>
</item>
<item>
 <title>Global warming is a fraud</title>
 <link>http://mathews2000.com/drupal/node/223</link>
 <description>&lt;p&gt;If there are any remaining questions (and there shouldn&#039;t be), this explosive cache of emails and documents reveals that global warming proponents manipulated and suppressed evidence to advance their agenda.&lt;/p&gt;
&lt;p&gt;&lt;a href=&quot;http://blogs.telegraph.co.uk/news/jamesdelingpole/100017393/climategate-the-final-nail-in-the-coffin-of-anthropogenic-global-warming/&quot; title=&quot;http://blogs.telegraph.co.uk/news/jamesdelingpole/100017393/climategate-the-final-nail-in-the-coffin-of-anthropogenic-global-warming/&quot;&gt;http://blogs.telegraph.co.uk/news/jamesdelingpole/100017393/climategate-...&lt;/a&gt;&lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/node/223#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <pubDate>Mon, 23 Nov 2009 12:33:38 -0800</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">223 at http://mathews2000.com/drupal</guid>
</item>
<item>
 <title>VisiPics - free software to find and remove duplicate pictures</title>
 <link>http://mathews2000.com/drupal/node/222</link>
 <description>&lt;p&gt;Like everyone who with a couple years of using a digital camera, I’ve got a lot of pictures on my hard drive.  And with a lot of pictures, came a lot of duplicates.  Between a couple backups that got merged together and taking four pictures of each scene, I mean a LOT of duplicates.  &lt;/p&gt;
&lt;p&gt;After a lot searching, I found &lt;a href=&quot;http://www.visipics.info/index.php?title=Main_Page&quot;&gt;VisiPics&lt;/a&gt;, which identifies duplicate pictures.  It is fast and does a fantastic job identifying pictures that are identical, but also can pick out pictures that are almost the same to let you pick the best of the four poses you took.  My only complaint is that the preview of the duplicates is so small that it is hard to decide between them.  VisiPics is free and has my strong recommendation.&lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/node/222#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/55">software review</category>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <pubDate>Sun, 08 Nov 2009 09:24:20 -0800</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">222 at http://mathews2000.com/drupal</guid>
</item>
<item>
 <title>A simple way to know you&#039;re missing some leadership skills</title>
 <link>http://mathews2000.com/drupal/node/221</link>
 <description>&lt;p&gt;&quot;You believe in some great practices that the team needs to follow, but you can&#039;t convince or get the team to follow them - even the simplest ones.&quot;&lt;/p&gt;
&lt;p&gt;&quot;If that happens to you - it&#039;s time to visit the idea that you may be lacking some core people skills, and leadership skills.&quot;&lt;/p&gt;
&lt;p&gt;Ouch, what an indictment.  But, it is true.  If I want to make positive changes and can&#039;t lift the proverbial lantern high enough for them to see, it is my problem.  Those that I&#039;m failing to influence don&#039;t see a problem or get frustrated.  I guess it is time for a refresher read of some of my old books on the subject.  Covey, Carnegie, etc, here I come.&lt;/p&gt;
&lt;p&gt;&lt;a href=&quot;http://5whys.com/blog/a-simple-way-to-know-youre-missing-some-leadership-skills.html&quot; title=&quot;http://5whys.com/blog/a-simple-way-to-know-youre-missing-some-leadership-skills.html&quot;&gt;http://5whys.com/blog/a-simple-way-to-know-youre-missing-some-leadership...&lt;/a&gt;&lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/node/221#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/54">leadership</category>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <pubDate>Tue, 20 Oct 2009 11:48:54 -0700</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">221 at http://mathews2000.com/drupal</guid>
</item>
<item>
 <title>System Notes - My favorite mercurial extensions </title>
 <link>http://mathews2000.com/drupal/node/220</link>
 <description>&lt;p&gt;There is a lot that the base Mercurial can do, but a robust extension mechanism allows all kinds of nice enhancements. We use BigFiles, and Forest, but there is lots more you can do. All of the publicly available extensions are listed at &lt;a href=&quot;http://mercurial.selenic.com/wiki/UsingExtensions&quot; target=&quot;_top&quot;&gt;http://mercurial.selenic.com/wiki/UsingExtensions&lt;/a&gt;. Here are some of my favorite mercurial extensions and how I use them.&lt;/p&gt;
&lt;p /&gt;
&lt;a name=&quot;foswikiTOC&quot;&gt;&lt;/a&gt;&lt;br /&gt;
&lt;div class=&quot;foswikiToc&quot;&gt;
&lt;ul&gt;
&lt;li&gt; &lt;a href=&quot;#alias_user_defined_command_alias&quot;&gt; alias - user-defined command aliases&lt;/a&gt;
&lt;/li&gt;
&lt;li&gt; &lt;a href=&quot;#pbranch_Collaborative_and_or_lon&quot;&gt; pbranch - Collaborative and/or long-term patch development and maintenance&lt;/a&gt;
&lt;/li&gt;
&lt;li&gt; &lt;a href=&quot;#purge_all_files_and_dirs_in_the&quot;&gt; purge - all files and dirs in the repository that are not being tracked by Mercurial&lt;/a&gt;
&lt;/li&gt;
&lt;li&gt; &lt;a href=&quot;#convert_Convert_repositories_fro&quot;&gt; convert - Convert repositories from other SCMs into Mercurial&lt;/a&gt;
&lt;/li&gt;
&lt;li&gt; &lt;a href=&quot;#share_Share_repository_history_b&quot;&gt; share - Share repository history between multiple repos&lt;/a&gt;
&lt;/li&gt;
&lt;/ul&gt;
&lt;/div&gt;
&lt;p /&gt;
&lt;h1&gt;&lt;a name=&quot;alias_user_defined_command_alias&quot;&gt;&lt;/a&gt; &lt;a href=&quot;http://mercurial.selenic.com/wiki/AliasExtension&quot; target=&quot;_top&quot;&gt;alias&lt;/a&gt; - user-defined command aliases &lt;/h1&gt;
&lt;p&gt;I love my command line, but don&#039;t like typing long commands over and over.  Alias makes it all work out.  Instead of typing &lt;code&gt;hg pull ssh://hg@mercurial.wilcoxassoc.com/PcDmis/QA&lt;/code&gt;, I simply type &lt;code&gt;hg pullQ&lt;/code&gt;.  I&#039;ve got about 10 entries in my mercurial.ini that cover all the normal commands I might type.&lt;/p&gt;
&lt;p /&gt;
&lt;h1&gt;&lt;a name=&quot;pbranch_Collaborative_and_or_lon&quot;&gt;&lt;/a&gt; &lt;a href=&quot;http://mercurial.selenic.com/wiki/PatchBranchExtension&quot; target=&quot;_top&quot;&gt;pbranch&lt;/a&gt; - Collaborative and/or long-term patch development and maintenance &lt;/h1&gt;
&lt;p&gt;I was initially quite excited about Attic/Shelve which allows a user to convinently shelve changes for later use.  After more review, I found Attic too simplistic.  The extension author advertises it for &quot;quick and dirty&quot; patch mangement, but I wanted more.  Mq promises the ability to do almost magical things with a mercurial repository.  I found it too complex and error prone for my taste.  It is bolted on top of mercurial instead of using it and has ways of loosing work.  Mq also lacks the ability to have multiple lines of development which to my mind is the primary reason to have patches.&lt;/p&gt;
&lt;p /&gt;
Pbranch seems to solve my problems with Attic and Mq.  It has all the power I could hope for.  It uses Mercurial concepts so I didn&#039;t have to learn much to feel comfortable.  If you already understand committing and named branches, there isn&#039;t much left to learn.&lt;/p&gt;
&lt;p /&gt;
A typical workflow might look like this:&lt;/p&gt;
&lt;p /&gt;
Create a new patch&lt;/p&gt;
&lt;pre&gt;&gt;&gt;&gt;hg pnew NewPatch
marked working directory as branch NewPatch

do some work...

&gt;&gt;&gt;hg commit -m&quot;work&quot;

do some more work...

&gt;&gt;&gt;hg commit -m&quot;more work&quot;&lt;/pre&gt;&lt;p /&gt;
Show your patch graph&lt;/p&gt;
&lt;pre&gt;&gt;&gt;&gt;hg pgraph
@  NewPatch
|
o  default
&lt;/pre&gt;&lt;p /&gt;
Your patch is marked as starting at a given changeset.  Others work needs to be pulled into your patch&lt;/p&gt;
&lt;pre&gt;&gt;&gt;&gt;hg pmerge
NewPatch: merging from default
merging asdf
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
.hgpatchinfo/NewPatch.dep already tracked!&lt;/pre&gt;&lt;p /&gt;
&lt;p /&gt;
You can see in the graphical log what happened.  PGraph pulled the changes on mainline into the patch&lt;/p&gt;
&lt;pre&gt;&gt;&gt;&gt;hg glog
@    changeset:   5:c76094c77c8f
|\   branch:      NewPatch
| |  tag:         tip
| |  parent:      3:9ace0ba2d369
| |  parent:      4:329504378326
| |  user:        Ben Mathews &lt;Ben.Mathews@HexagonMetrology.com&gt;
| |  date:        Thu Aug 20 16:07:09 2009 -0600
| |  summary:     merge of default
| |
| o  changeset:   4:329504378326
| |  parent:      0:30a5ae17ec4d
| |  user:        Ben Mathews &lt;Ben.Mathews@HexagonMetrology.com&gt;
| |  date:        Thu Aug 20 16:06:58 2009 -0600
| |  summary:     work on mainline
| |
o |  changeset:   3:9ace0ba2d369
| |  branch:      NewPatch
| |  user:        Ben Mathews &lt;Ben.Mathews@HexagonMetrology.com&gt;
| |  date:        Thu Aug 20 16:06:24 2009 -0600
| |  summary:     more work
| |
o |  changeset:   2:f7e7988453c0
| |  branch:      NewPatch
| |  user:        Ben Mathews &lt;Ben.Mathews@HexagonMetrology.com&gt;

| |  date:        Thu Aug 20 16:06:10 2009 -0600
| |  summary:     work
| |
o |  changeset:   1:c5cd26061a49
|/   branch:      NewPatch
|    user:        Ben Mathews &lt;Ben.Mathews@HexagonMetrology.com&gt;
|    date:        Thu Aug 20 16:05:57 2009 -0600
|    summary:     start new patch on default
|
o  changeset:   0:30a5ae17ec4d
   user:        Ben Mathews &lt;Ben.Mathews@HexagonMetrology.com&gt;
   date:        Thu Aug 20 16:05:48 2009 -0600
   summary:     base&lt;/pre&gt;&lt;p /&gt;
When it comes time to apply the patch, dump it out and apply it as a &lt;em&gt;real&lt;/em&gt; changeset.&lt;/p&gt;
&lt;pre&gt;&gt;&gt;&gt;hg pdiff &gt; ..\patch

&gt;&gt;&gt;hg up default
1 files updated, 0 files merged, 1 files removed, 0 files unresolved

&gt;&gt;&gt;hg import -m&quot;apply pbranch patch&quot; ..\patch
applying ..\patch&lt;/pre&gt;&lt;p /&gt;
&lt;h1&gt;&lt;a name=&quot;purge_all_files_and_dirs_in_the&quot;&gt;&lt;/a&gt; &lt;a href=&quot;http://mercurial.selenic.com/wiki/PurgeExtension&quot; target=&quot;_top&quot;&gt;purge&lt;/a&gt; - all files and dirs in the repository that are not being tracked by Mercurial &lt;/h1&gt;
&lt;p&gt;Purge is clean on steroids.  Running &lt;code&gt;purge --all&lt;/code&gt; leaves your repository as if you just cloned it.  You are guaranteed no strange errors from left over obj and pch files.  This is a simple command, and I use it regularly.&lt;/p&gt;
&lt;p /&gt;
&lt;h1&gt;&lt;a name=&quot;convert_Convert_repositories_fro&quot;&gt;&lt;/a&gt; &lt;a href=&quot;http://mercurial.selenic.com/wiki/ConvertExtension&quot; target=&quot;_top&quot;&gt;convert&lt;/a&gt; - Convert repositories from other SCMs into Mercurial &lt;/h1&gt;
&lt;p&gt;Unlike Purge, I don&#039;t use Convert very often.  When I do, it is pretty impressive.  The primary purpose of the extension is to import other source control systems into mercurial.  The part that I love though is its filemap feature.  Using it, I can slice and dice a repository into the shape I want it.  One recent case that I used it for was with our Math library.  I wanted to change the name of a directory and remove a couple of the files.  I could have renamed the directory and deleted the files, but then the history wouldn&#039;t have been consistent.  Using convert, I rewrote the history so that the it was as if the deleted files had never existed and the renamed files had always been renamed.&lt;/p&gt;
&lt;p /&gt;
&lt;h1&gt;&lt;a name=&quot;share_Share_repository_history_b&quot;&gt;&lt;/a&gt; &lt;a href=&quot;http://mercurial.selenic.com/wiki/ShareExtension&quot; target=&quot;_top&quot;&gt;share&lt;/a&gt; - Share repository history between multiple repos &lt;/h1&gt;
&lt;p&gt;I like to keep several copies of our repository around so I can work on different projects.  This means that I&#039;m always shuffling changesets around and never have all my copies quite up to date.  The share extension allows my several repositories to share one history store and only do one pull.&lt;/p&gt;
&lt;p /&gt;
Because our repository is so large, having multiple clones causes problems with disk space.  Using the share extension, I can share most of the contents of the .hg directory (history) between multiple working directories.  A full clone of our repository takes 781mb on disk.  By using the share extension, I can reduce this to the 149mb that the tip revision takes when checked out into the working directory.  &lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/node/220#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/53">System Notes</category>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <pubDate>Thu, 20 Aug 2009 15:52:27 -0700</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">220 at http://mathews2000.com/drupal</guid>
</item>
<item>
 <title>A Portrait of Mormons in the U.S.</title>
 <link>http://mathews2000.com/drupal/node/219</link>
 <description>&lt;p&gt;&quot;A new analysis of the Landscape Survey data reveals that as a group Mormons are among the most devout and conservative religious people in the country. The Mormon community is also internally diverse, with differences according to levels of religious commitment and educational attainment, regions of the country where Mormons live, and between lifelong Mormons and those who have converted to the faith. This report explores Mormons&#039; unique place in the American religious landscape and is divided into three parts: demographic characteristics, religious beliefs and practices, and social and political views.&quot;&lt;/p&gt;
&lt;p&gt;&lt;a href=&quot;http://pewforum.org/docs/?DocID=427&quot; title=&quot;http://pewforum.org/docs/?DocID=427&quot;&gt;http://pewforum.org/docs/?DocID=427&lt;/a&gt;&lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/node/219#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <pubDate>Tue, 28 Jul 2009 06:47:20 -0700</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">219 at http://mathews2000.com/drupal</guid>
</item>
<item>
 <title>System Notes - Fun with branching and merging </title>
 <link>http://mathews2000.com/drupal/node/218</link>
 <description>&lt;p&gt;&lt;i&gt;Note: My company recently started using Mercurial.  I wrote this article to provide some education on the value of branches.&lt;/i&gt;&lt;/p&gt;
&lt;p&gt;There have been some emails flying around discussing making branches so we can &amp;ldquo;isolate changes.&amp;rdquo; I thought some discussion of what a branch is and what it is good for was warranted.&lt;/p&gt;
&lt;p /&gt;
A branch isn&amp;rsquo;t anything complicated. It is simply a way for to make some changes without sharing them with everyone else. Jeff Atwood &lt;a href=&quot;http://www.codinghorror.com/blog/archives/000968.html&quot; target=&quot;_top&quot;&gt;describes branching as a parallel universe&lt;/a&gt;. &quot;They&#039;re places where, for whatever reason, history didn&#039;t go quite the same way as it did in your universe.&quot; In our company, we could have used a &quot;parallel universe&quot; to:
&lt;ul&gt;
&lt;li&gt; Upgrade to a new compiler while everyone else works on the old one.
&lt;/li&gt;
&lt;li&gt; Add in a new graphics engine without lots of ugly preprocessor macros
&lt;/li&gt;
&lt;li&gt; Develop a new feature that is poorly defined and therefore risky
&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;Branching would have simplified the contention developers from different parts of the company faced.&lt;/p&gt;
&lt;p /&gt;
To get technical, in mercurial anytime two changesets are committed against a common parent, a branch is created. A simple illustration shows how this works.&lt;/p&gt;
&lt;p /&gt;
&lt;pre&gt;
L:\illustration&amp;#62;hg commit -A -m &amp;#34;root&amp;#34;
adding test.txt


&amp;#60;&amp;#60;do some work&amp;#62;&amp;#62;

L:\illustration&amp;#62;hg commit -m &amp;#34;branch a&amp;#34;
&lt;/pre&gt;&lt;p /&gt;
Back up to a parent changeset. Remember, branches are created by making multiple commits to a given changeset.&lt;/p&gt;
&lt;pre&gt;L:\illustration&amp;#62;hg up 0 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

&amp;#60;&amp;#60;do some work&amp;#62;&amp;#62;

L:\illustration&amp;#62;hg commit -m &amp;#34;branch b&amp;#34;

created new head

L:\illustration&amp;#62;hg glog
&amp;#64;  changeset:   2:fa2d515d48a1
&amp;#124;  tag:         tip
&amp;#124;  parent:      0:376cbd5c11ae
&amp;#124;  user:        Ben Mathews &amp;#60;Ben.Mathews&amp;#64;HexagonMetrology.com&amp;#62;
&amp;#124;  date:        Mon Jul 13 12:52:11 2009 -0600
&amp;#124;  summary:     branch b

&amp;#124;
&amp;#124; o  changeset:   1:b4376a3bc2af
&amp;#124;/   user:        Ben Mathews &amp;#60;Ben.Mathews&amp;#64;HexagonMetrology.com&amp;#62;
&amp;#124;    date:        Mon Jul 13 12:51:52 2009 -0600
&amp;#124;    summary:     branch a
&amp;#124;
o  changeset:   0:376cbd5c11ae
   user:        Ben Mathews &amp;#60;Ben.Mathews&amp;#64;HexagonMetrology.com&amp;#62;
   date:        Mon Jul 13 12:51:23 2009 -0600
   summary:     root

&lt;/pre&gt;&lt;p /&gt;
This gives us a TortoiseHg changelog like this &lt;br /&gt;&lt;img width=&quot;232&quot; alt=&quot;simplebranch.png&quot; src=&quot;http://mathews2000.com/drupal/files/simplebranch.png&quot; height=&quot;66&quot; /&gt;&lt;/p&gt;
&lt;p /&gt;
&lt;h1&gt;&lt;a name=&quot;Complications&quot;&gt;&lt;/a&gt; Complications &lt;/h1&gt;
&lt;p&gt; Nothing comes free in life, and branching does have its problems. There is some complexity tracking which changes are where and eventually, those parallel universes have to be merged back together.&lt;/p&gt;
&lt;p /&gt;
There is a trade off between complexity and code safety. No branches avoids all the complexity, but gives us none of the benefits. Thousands of branches buries the benefits in the overhead of tracking and maintaining them. At some point in the middle, there is a sweet spot where branches protect the source code, but are not too much hassle the work with.&lt;/p&gt;
&lt;p /&gt;
&lt;h1&gt;&lt;a name=&quot;Merging_without_branches&quot;&gt;&lt;/a&gt; Merging without branches &lt;/h1&gt;
&lt;p&gt; Branches give the appearance of causing merge problems because we often procrastinate merging branches until it is really hard. But, what branches really do is give you control when the merging is done. If we worked on one mainline with no branches, we still have to merge our work with other developers. The difference is we have no control over when the merging is done. The timing is dictated by when the other programmers push their changes to the server, not when it is convenient for me to merge. With branches, I decided when I want to incorporate others work into mine. Lets look how this works&lt;/p&gt;
&lt;p /&gt;
&lt;pre&gt;
&amp;#60;&amp;#60;do some work&amp;#62;&amp;#62;

L:\illustration\client&amp;#62;hg commit -A -m &amp;#34;more work&amp;#34;
&lt;/pre&gt;&lt;p&gt; Meanwhile, the other guy is working away and beats you pushing code up &lt;/p&gt;
&lt;pre&gt;
&amp;#60;&amp;#60;do some work&amp;#62;&amp;#62;

L:\illustration\client2&amp;#62;hg commit -m &amp;#34;other guys work&amp;#34;

L:\illustration\client2&amp;#62;hg push
pushing to l:\illustration\server
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
&lt;/pre&gt;&lt;p /&gt;
This means you can&#039;t push without doing the whole pull, merge routine. (You have had to do this a couple times right?)&lt;/p&gt;
&lt;pre&gt;
L:\illustration\client&amp;#62;hg push
pushing to l:\illustration\server
searching for changes
abort: push creates new remote heads!
(did you forget to merge? use push -f to force)

L:\illustration\client&amp;#62;hg pull
pulling from l:\illustration\server
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run &amp;#39;hg heads&amp;#39; to see heads, &amp;#39;hg merge&amp;#39; to merge)

L:\illustration\client&amp;#62;hg merge
merging test.txt
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don&amp;#39;t forget to commit)

L:\illustration\client&amp;#62;hg commit

L:\illustration\client&amp;#62;hg push
pushing to l:\illustration\server
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files

&lt;/pre&gt;&lt;p&gt; &lt;img width=&quot;320&quot; alt=&quot;mergeconflicts.png&quot; src=&quot;http://mathews2000.com/drupal/files/mergeconflicts.png&quot; height=&quot;96&quot; /&gt;&lt;/p&gt;
&lt;p /&gt;
Using this method, your changelog will start to get a lot of these loops in it. A couple times doing this and it gets frustrating. I&#039;ve heard some of this frustration and sympathize with you. Frustration naturally begets shortcuts like not compiling a merge or testing completely. Let us look at an easier alternative using branches.&lt;/p&gt;
&lt;p /&gt;
&lt;h1&gt;&lt;a name=&quot;Merging_with_branches&quot;&gt;&lt;/a&gt; Merging with branches &lt;/h1&gt;
&lt;p&gt; Here we use a model were our changes stay on a branch until we are done with them. To ease merging at the end of what could be a long running branch, we ocasionaly do a reverse merge, pulling others changes into our branch. When we are done, we merge our changes into the mainline.&lt;/p&gt;
&lt;p /&gt;
We want to create a branch, so go ahead and force a push that creates multiple heads.&lt;/p&gt;
&lt;pre&gt;
L:\illustration2\client1&amp;#62;hg push
pushing to l:\illustration2\server
searching for changes
abort: push creates new remote heads!
(did you forget to merge? use push -f to force)

L:\illustration2\client1&amp;#62;hg push -f
pushing to l:\illustration2\server
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
&lt;/pre&gt;&lt;p /&gt;
Now, we do some more work uninteruppted by others changes. However, we can&#039;t ignore others changes completely. Every change you and the other guys make is diverging the two branches. You could wait until the end of your efforts to merge the other guys changes in, but that would probably be really hard. To make it easier, ocassionally pull in others changes to your branch.&lt;/p&gt;
&lt;pre&gt;
L:\illustration2\client1&amp;#62;hg pull
pulling from l:\illustration2\server
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 1 files (+1 heads)
(run &amp;#39;hg heads&amp;#39; to see heads, &amp;#39;hg merge&amp;#39; to merge)

L:\illustration2\client1&amp;#62;hg merge
merging test.txt
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don&amp;#39;t forget to commit)
&lt;/pre&gt;&lt;p&gt; &lt;img width=&quot;224&quot; alt=&quot;branchreverseintegration.png&quot; src=&quot;http://mathews2000.com/drupal/files/branchreverseintegration.png&quot; height=&quot;213&quot; /&gt;&lt;/p&gt;
&lt;p /&gt;
Eventually, you have finished with this branch and are ready to merge it back to the mainline. Switch to the mainline and merge the branch into it.&lt;/p&gt;
&lt;pre&gt;
L:\illustration2\client1&amp;#62;hg up 10 -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

L:\illustration2\client1&amp;#62;hg merge
merging test.txt
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don&amp;#39;t forget to commit)

L:\illustration2\client1&amp;#62;hg commit
&lt;/pre&gt;&lt;p&gt; &lt;img width=&quot;392&quot; alt=&quot;branchend.png&quot; src=&quot;http://mathews2000.com/drupal/files/branchend.png&quot; height=&quot;283&quot; /&gt;&lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/node/218#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/53">System Notes</category>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <enclosure url="http://mathews2000.com/drupal/files/mergeconflicts.png" length="2160" type="image/png" />
 <pubDate>Tue, 14 Jul 2009 07:03:03 -0700</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">218 at http://mathews2000.com/drupal</guid>
</item>
<item>
 <title>Liberty Is Not a Mistress, But a Grandmother </title>
 <link>http://mathews2000.com/drupal/node/217</link>
 <description>&lt;p&gt;Jeff Lindsay writes a great poem on liberty, its fragile nature, and the continuing care it needs.&lt;/p&gt;
&lt;p&gt;&lt;a href=&quot;http://mormanity.blogspot.com/2009/07/liberty-is-not-mistress-but-grandmother.html&quot;&gt;Liberty is not a young mistress:&lt;br /&gt;
Convenient, alluring, fragrant skin&lt;br /&gt;
Glistening even in the darkest shadows...&lt;/a&gt;&lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/node/217#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <pubDate>Mon, 06 Jul 2009 07:43:28 -0700</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">217 at http://mathews2000.com/drupal</guid>
</item>
<item>
 <title>Freedom Festival 5K</title>
 <link>http://mathews2000.com/drupal/node/216</link>
 <description>&lt;p&gt;&lt;a href=&quot;http://results.active.com/pages/oneResult.jsp?pID=61843011&amp;amp;rsID=46063&quot; title=&quot;http://results.active.com/pages/oneResult.jsp?pID=61843011&amp;amp;rsID=46063&quot;&gt;http://results.active.com/pages/oneResult.jsp?pID=61843011&amp;amp;rsID=46063&lt;/a&gt;&lt;/p&gt;
&lt;p&gt;I ran the Freedom Festival 5K yesterday in 23:26, a 3:50 improvement over last year.  This gets me into the &quot;sort of in shape&quot; level of fitness.  But, it has been so long since I&#039;ve been at this level, that it feels really great.  Now, if my calves would stop cramping.&lt;/p&gt;
</description>
 <comments>http://mathews2000.com/drupal/node/216#comments</comments>
 <category domain="http://mathews2000.com/drupal/taxonomy/term/1">Public</category>
 <pubDate>Sun, 05 Jul 2009 16:32:21 -0700</pubDate>
 <dc:creator>Ben Mathews</dc:creator>
 <guid isPermaLink="false">216 at http://mathews2000.com/drupal</guid>
</item>
</channel>
</rss>
