TortoiseHg 2.4 on Debian GNU/Linux. I made a commit, which consisted of some changes and the addition of 2 files, and then wanted to change the comment. Then I did (all from the GUI) an undo, which created a commit that undid the previous commit--not what I was looking for. Then I selected backout (I think--all from memory). Though I did 2 operations, the log window only shows one.
The output log in the GUI does not contain the commit that reversed the previous commit, but the files I added are missing from the working directory. hg update has no effect. Log (displayed in TortoiseHg GUI): % hg add --repository /home/ross/UCSF/HIVRace /home/ross/UCSF/HIVRace/simpleMatch.R /home/ross/UCSF/HIVRace/simpleMatch1.pdf [command completed successfully Mon Jul 21 20:23:10 2014] % hg commit --repository /home/ross/UCSF/HIVRace --verbose --user Ross Boylan <[email protected]> --message=Add new section (F) [rest of comment omitted] [ -- /home/ross/UCSF/HIVRace/HIVRaceGrant.lyx /home/ross/UCSF/HIVRace/simpleMatch.R /home/ross/UCSF/HIVRace/simpleMatch1.pdf HIVRaceGrant.lyx simpleMatch.R simpleMatch1.pdf committed changeset 12:3b19a97ca3cf [command completed successfully Mon Jul 21 20:23:10 2014] % hg rollback --repository /home/ross/UCSF/HIVRace --verbose repository tip rolled back to revision 12 (undo commit) working directory now based on revision 12 [command completed successfully Mon Jul 21 20:24:41 2014] The log shows an add, a commit, and a rollback. There is no sign of the creation of the commit that reversed the earlier one, and only one operation appears (hg rollback) after the original commit, although I performed at least 2 steps after that. Several questions: 1) how do I get the working directory to match my current tip (revision 12)? hg revert? Is there a way to do it from the tortoise gui? 2) Is there any way to amend the comment for what is now the tip commit? How? (I have a feeling it's not possible because of the subsequent reversing commit and its removal). 3) What would have been the right way to handle my initial goal of revising the newly created commit log message (with raw hg or tortoise)? 4) What happened? In particular, why does the log seem to be missing some of the transactions I did? I have not pushed any of this mess anywhere else. Thanks. Ross Boylan P.S. The doc say hg rollback does not affect the working directory, but that hg update brings the working directory in sync with the tip. But the tip has the files I added, and the working directory does not, even after hg update. Terminal (after all the above): ross@tempserver:~/UCSF/HIVRace$ hg update 0 files updated, 0 files merged, 0 files removed, 0 files unresolved ross@tempserver:~/UCSF/HIVRace$ hg status M HIVRaceGrant.lyx ! simpleMatch.R ! simpleMatch1.pdf [other junk files snipped] ross@tempserver:~/UCSF/HIVRace$ hg head changeset: 12:3b19a97ca3cf tag: tip user: Ross Boylan <[email protected]> date: Mon Jul 21 20:23:10 2014 -0700 summary: Add new section (F) about differences between modeling and statistics. But ------------------------------------------------------------------------------ Want fast and easy access to all the code in your enterprise? Index and search up to 200,000 lines of code with a free copy of Black Duck Code Sight - the same software that powers the world's largest code search on Ohloh, the Black Duck Open Hub! Try it now. http://p.sf.net/sfu/bds _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
