I pulled from the wrong repository into the local "Ross" project and then did an update. I noticed lots of messages "removing filexxx" and interrupted it; I do not recall exactly how. The I tried to roll back.
This seemed to be working, but the little progress bar on the bottom left of the workbench is stuck at "updating 200 / 534 files". There is a pink bar at the top of the display for "Ross" that says "abort: uncommitted changes". hg status in a terminal in the repo gives a long list of ! and ? files (there was a long list of such files before, I think, but some ar the files named in the "removing xxx" messages) but otherwise says nothing. I went to the local repository, "Sunbelt" that matched the remote one and did a pull and then update. The pull seemed to work, but I think the update is blocked by the other update that is hung. I'm in a real mess and would appreciate some help. My goals are 1) restore the "Ross" project I incorrectly updated to its original form. If possible I'd even like to remove the changes I pulled. 2) integrate the changes into the right repository, "Sunbelt". 3) get the thg workbench unstuck. I'm also curious to know what's going on. In particular, is there any risk that files that weren't under version control in "Ross" have been deleted or changed? It may be relevant that the Sunbelt project was created by copying some files that are in Ross, and some of them have been copied back. The copies here are file system copies. Here are the commands showing in the transcript window, with ## before comments added later % hg --repository I:\LAMOC\Ross pull --verbose c:\users\rdboylan\appdata\local\temp\thg.mrahtg\https__bitbucket.org_RossBoylan_sunbelt_eatky7.hg pulling from c:\users\rdboylan\appdata\local\temp\thg.mrahtg\https__bitbucket.org_RossBoylan_sunbelt_eatky7.hg searching for changes all local heads known remotely 43 changesets found adding changesets adding manifests adding file changes added 43 changesets with 44 changes to 9 files (+1 heads) (run 'hg heads .' to see heads, 'hg merge' to merge) [command completed successfully Fri Sep 20 16:34:12 2013] % hg update --verbose --config ui.merge=internal:fail --rev 1183 --check resolving manifests removing 090729 LAMOC sexual behaviors.doc ### many more removing ... messages removing drugs02.log ### note: no message about abort or complete % hg update --verbose --config ui.merge=internal:fail --rev "Real Corr" --check abort: uncommitted local changes [command returned code 255 Fri Sep 20 16:39:45 2013] % hg rollback --verbose repository tip rolled back to revision 1140 (undo pull: bundle:I:\LAMOC\Ross+c:\users\rdboylan\appdata\local\temp\thg.mrahtg\https__bitbucket.org_RossBoylan_sunbelt_eatky7.hg) [command completed successfully Fri Sep 20 16:40:18 2013] % hg --repository C:\Users\rdboylan\Documents\Sunbelt incoming --quiet --bundle c:\users\rdboylan\appdata\local\temp\thg.mrahtg\https__bitbucket.org_RossBoylan_sunbelt_8lifzl.hg https://bitbucket.org/RossBoylan/sunbelt ### long list .... [command completed successfully Fri Sep 20 16:41:58 2013] % hg --repository C:\Users\rdboylan\Documents\Sunbelt pull --verbose c:\users\rdboylan\appdata\local\temp\thg.mrahtg\https__bitbucket.org_RossBoylan_sunbelt_8lifzl.hg pulling from c:\users\rdboylan\appdata\local\temp\thg.mrahtg\https__bitbucket.org_RossBoylan_sunbelt_8lifzl.hg searching for changes all local heads known remotely 30 changesets found adding changesets adding manifests adding file changes added 30 changesets with 31 changes to 6 files (run 'hg update' to get a working copy) [command completed successfully Fri Sep 20 16:42:05 2013] ### no update command I'm running THG 2.8.1 Thanks. Ross Boylan ------------------------------------------------------------------------------ LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99! 1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint 2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13. http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
