Hi, >> I have to admit I don't know how to read this output or what I should look >> for in the way of conflicts. Are these resources helpful? (You don’t have to read them all, but if the first doesn’t work, try the following one.)
About log: http://mercurial.selenic.com/wiki/TutorialHistory http://mercurial.selenic.com/wiki/GraphlogExtension http://mercurial.aragost.com/kick-start/en/basic/#inspecting-history About merges, heads and parents: http://hginit.com/04.html http://mercurial.selenic.com/wiki/Merge http://mercurial.selenic.com/wiki/UnderstandingMercurial#Revisions.2C_changesets.2C_heads.2C_and_tip http://mercurial.selenic.com/wiki/MultipleHeads To help us troubleshoot your issue, can you confirm this: you were in a clone with the 2.5 branch checked out (“hg id” will tell that), you pulled from 2.6, and the update action (from “pull -u”) failed. >> [...] I think that would make my local change unnecessary. Correct. >> So, my next project is to try and figure out how to undo my change. http://mercurial.selenic.com/wiki/PruningDeadBranches#Using_clone If you follow that method, don’t forget to copy your .hg/hgrc to the new clone. >> This seemed to work: “Seemed” is the right word :( More on http://mercurial.selenic.com/wiki/Revert or “hg help revert”. > No. Revert just reverts local (non-committed) changes. This is untrue; Skip used a -r argument. See above. One thing to understand is that revert changes file contents only, whereas update moved you on the revision graph. > [snip] Advanced commands like strip (bundled with mq BTW, not rebase) should *not* be recommended lightly to people who are still learning the normal use of Mercurial, IMO. Throwing mentions of rebase, strip, transplant can be harmful. Let’s focus on clone, pull, update and merge first. (That’s why the devguide tries to select one or two workflows; we know that Mercurial is hella flexible, but choice is not a good thing when you’re learning.) Regards _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
