Hi Patrick, I suspect you have something odd happening with your editor, and that mercurial is waiting for you to resolve the merging one way or another.
Andreas From: Patrick via gem5-users <gem5-users@gem5.org<mailto:gem5-users@gem5.org>> Reply-To: Patrick <plafr...@gmail.com<mailto:plafr...@gmail.com>>, gem5 users mailing list <gem5-users@gem5.org<mailto:gem5-users@gem5.org>> Date: Friday, 13 February 2015 23:55 To: gem5 users mailing list <gem5-users@gem5.org<mailto:gem5-users@gem5.org>> Subject: [gem5-users] "hg update" hanging Hello, I made some changes to my working copy of gem5, and now I'm trying to update it. When I run "hg update", Mercurial prints out the following and then hangs: "merging SConstruct merging configs/common/CacheConfig.py 3 files to edit" Has anyone seen this before? Any help is appreciated. Patrick -- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2557590 ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2548782
_______________________________________________ gem5-users mailing list gem5-users@gem5.org http://m5sim.org/cgi-bin/mailman/listinfo/gem5-users
