The best option is usually to create patches of your modifications, and before
you do any update, make sure you do a qpop –a. Then, with the up-to-date source
you can push your patches and solve any merge conflicts as part of the patch
re-basing.
In your current situation, if you really don't mind loosing your changes I
would thing a revert —all should do the trick.
Andreas
From: Hui Zhao <[email protected]<mailto:[email protected]>>
Reply-To: gem5 users mailing list
<[email protected]<mailto:[email protected]>>
Date: Sat, 13 Jul 2013 05:54:09 +0100
To: gem5 users mailing list <[email protected]<mailto:[email protected]>>
Subject: [gem5-users] conflicts after hg pull
Hello
I did a 'hg pull http://repo.gem5.org/gem5', then 'hg update' and 'hg
merge'. Because I have some modified codes in gem5, there are conflicts in the
hg update.
Now my gem5 can't get compiled, probably because of those conflicts.
How can I restore to a working version of Gem5? Is there any to go back to
my former working Gem5? If I don't want to create a new gem5 space.
Thanks
-- 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.
_______________________________________________
gem5-users mailing list
[email protected]
http://m5sim.org/cgi-bin/mailman/listinfo/gem5-users
