<HTML><BODY style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space; "><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR></SPAN></FONT><DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">On Apr 25, 2007, at 10:58 PM, Allan Wind wrote:</SPAN></FONT></DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="Apple-interchange-newline"></SPAN></FONT><BLOCKQUOTE type="cite"><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">I was trying this variation of the merge tutorial</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">(<A href="http://www.selenic.com/mercurial/wiki/index.cgi/TutorialConflict">http://www.selenic.com/mercurial/wiki/index.cgi/TutorialConflict</A>):</SPAN></FONT></DIV></BLOCKQUOTE><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">Okay, I'm attempting to track your progress through the tutorial. I'm assuming that the repo you are in is the my-hello-not-cvs part of the tutorial as a clone of <A href="http://www.selenic.com/repo/hello">http://www.selenic.com/repo/hello</A></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">My I added the 'printf("sure am glad I'm not using CVS!\n");' and committed. My hg log looks like so:</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 2:127bff2d471f</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">tag: tip</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: "Shane Holloway <<A href="mailto:shane.holloway@ieee.org">shane.holloway@ieee.org</A>>"</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Thu Apr 26 08:49:17 2007 -0600</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Give thanks for dodging bullet</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 1:82e55d328c8c</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: <A href="mailto:mpm@selenic.com">mpm@selenic.com</A></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Fri Aug 26 01:21:28 2005 -0700</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Create a makefile</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 0:0a04b987be5a</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: <A href="mailto:mpm@selenic.com">mpm@selenic.com</A></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Fri Aug 26 01:20:50 2005 -0700</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Create a standard "hello, world" program</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">I also replicated my-hello-new-output repository from that tutorial. It's hg log looks like so:</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 2:ffd77fa2c410</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">tag: tip</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: "Shane Holloway <<A href="mailto:shane.holloway@ieee.org">shane.holloway@ieee.org</A>>"</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Thu Apr 26 08:45:08 2007 -0600</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Express great joy at existence of Mercurial</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 1:82e55d328c8c</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: <A href="mailto:mpm@selenic.com">mpm@selenic.com</A></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Fri Aug 26 01:21:28 2005 -0700</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Create a makefile</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 0:0a04b987be5a</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: <A href="mailto:mpm@selenic.com">mpm@selenic.com</A></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Fri Aug 26 01:20:50 2005 -0700</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Create a standard "hello, world" program</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">Notice that the first two changesets are identical. Now let's continue into your message from the repository of my-hello-not-cvs. :)</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><BLOCKQUOTE type="cite"><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">$ hg pull ../my-hello-new-output</SPAN></FONT></DIV></BLOCKQUOTE><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">Ok, after the pull, I get the important message "added 1 changesets with 1 changes to 1 files (+1 heads)". My hg log now looks like so:</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 3:ffd77fa2c410</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">tag: tip</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">parent: 1:82e55d328c8c</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: "Shane Holloway <<A href="mailto:shane.holloway@ieee.org">shane.holloway@ieee.org</A>>"</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Thu Apr 26 08:45:08 2007 -0600</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Express great joy at existence of Mercurial</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 2:127bff2d471f</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: "Shane Holloway <<A href="mailto:shane.holloway@ieee.org">shane.holloway@ieee.org</A>>"</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Thu Apr 26 08:49:17 2007 -0600</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Give thanks for dodging bullet</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 1:82e55d328c8c</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: <A href="mailto:mpm@selenic.com">mpm@selenic.com</A></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Fri Aug 26 01:21:28 2005 -0700</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Create a makefile</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 0:0a04b987be5a</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: <A href="mailto:mpm@selenic.com">mpm@selenic.com</A></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Fri Aug 26 01:20:50 2005 -0700</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Create a standard "hello, world" program</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">Notice the new changeset #3: ffd77fa2c410 -- it is the same changeset from the ../my-hello-new-output repository we just pulled from. The hash id is the changeset identifier. The number '3' is a number for convenience. It has no meaning outside of this repository, and is simply a number reflecting the order it was pulled into this repository. So now we have the head changesets from both repositories, and thus have +1 heads. If we run hg heads:</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 3:ffd77fa2c410</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">tag: tip</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">parent: 1:82e55d328c8c</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: "Shane Holloway <<A href="mailto:shane.holloway@ieee.org">shane.holloway@ieee.org</A>>"</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Thu Apr 26 08:45:08 2007 -0600</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Express great joy at existence of Mercurial</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 2:127bff2d471f</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: "Shane Holloway <<A href="mailto:shane.holloway@ieee.org">shane.holloway@ieee.org</A>>"</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Thu Apr 26 08:49:17 2007 -0600</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Give thanks for dodging bullet</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">And hg id reports that we are currently updated to changeset 127bff2d471f</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV></DIV><BLOCKQUOTE type="cite"><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">$ hg update</SPAN></FONT></DIV></BLOCKQUOTE><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">When I run this command, I get the message "abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes". I can merge from either this head or the other head. Assuming you did "hg update -C" after the error message, my hg id now reports "ffd77fa2c410 tip"</SPAN></FONT></DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR></SPAN></FONT><BLOCKQUOTE type="cite"><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">$ hg merge</SPAN></FONT></DIV></BLOCKQUOTE><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">Whiz-bang file-merge tool appears, I choose my modifications. My hg id now reports:</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">"ffd77fa2c410+127bff2d471f+ tip"</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">Signaling that it is a merge of those two heads, and modified.</SPAN></FONT></DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR></SPAN></FONT><BLOCKQUOTE type="cite"><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">The merge, strangely, cause revision 3, and the commit revision 4.</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">$ hg commit -m 'merged stuff' </SPAN></FONT></DIV></BLOCKQUOTE><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">I now have a new hg head:</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 4:bb5551e150d0</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">tag: tip</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">parent: 3:ffd77fa2c410</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">parent: 2:127bff2d471f</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: "Shane Holloway <<A href="mailto:shane.holloway@ieee.org">shane.holloway@ieee.org</A>>"</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Thu Apr 26 09:11:33 2007 -0600</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Merged stuff</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR></SPAN></FONT><BLOCKQUOTE type="cite"><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">Anyways, now I want to revert to the pre-merge version (2):</SPAN></FONT></DIV></BLOCKQUOTE><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">I'm guessing you don't actually want to revert, which means to create a changeset that reverses the change of that version, and then merge it into the current head. What I think you want to do is try the operation again. You cannot do that from this repository because it already contains the changesets recording the merge and the pull. Mercurial is very conservative about not loosing changesets. What you need to do is to hg clone again to start clean.</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">$ cd ..</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">$ hg clone -r 2 my-hello-not-cvs 2nd-hello-not-cvs </SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">$ cd 2nd-hello-not-cvs</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">$ hg log</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 2:127bff2d471f</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">tag: tip</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: "Shane Holloway <<A href="mailto:shane.holloway@ieee.org">shane.holloway@ieee.org</A>>"</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Thu Apr 26 08:49:17 2007 -0600</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Give thanks for dodging bullet</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 1:82e55d328c8c</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: <A href="mailto:mpm@selenic.com">mpm@selenic.com</A></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Fri Aug 26 01:21:28 2005 -0700</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Create a makefile</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">changeset: 0:0a04b987be5a</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">user: <A href="mailto:mpm@selenic.com">mpm@selenic.com</A></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">date: Fri Aug 26 01:20:50 2005 -0700</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">summary: Create a standard "hello, world" program</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">Now you can see that you are back to were you started, before the merge, and you can play with it some more.</SPAN></FONT></DIV><DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR></SPAN></FONT><BLOCKQUOTE type="cite"><DIV></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">If I try to pull it in again I get a different behavior than the first</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">time around:</SPAN></FONT></DIV></BLOCKQUOTE><BLOCKQUOTE type="cite"><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">$ hg pull ../my-hello-new-output</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">pulling from ../my-hello-new-output</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">searching for changes</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">no changes found</SPAN></FONT></DIV></BLOCKQUOTE><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">That is expected. You are pulling again from the same (unchanged) repository. You current repository contains all the changes from my-hello-new-output, a merged changeset 4: bb5551e150d0, and a revert changeset to reverse the merge changeset. Since it contains all of these, there are now new changesets to be pulled. The repository has it recorded that they are already integrated.</SPAN></FONT></DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR><BR></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">I hope this helps you out Allan! It can be a bit confusing, but I've found the system very reliable, and pretty understandable once I broke myself of thinking of things in terms of SourceSafe, CVS, or Subversion... ;) It was hard, but we have been using it very successfully at my company.</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;">-Shane Holloway</SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><DIV><FONT class="Apple-style-span" face="Courier New" size="3"><SPAN class="Apple-style-span" style="font-size: 13px;"><BR class="khtml-block-placeholder"></SPAN></FONT></DIV><FONT class="Apple-style-span" face="Courier New"><BR></FONT></BODY></HTML>