> From: Farley Benoît [mailto:[email protected]] > Sent: Thursday, May 01, 2014 8:57 AM > To: [email protected] > Subject: [thg] How to bring changes from local repository to working directory > > I'm having trouble bringing changes from the remote repository to the working > directory. I started by pulling the changes from the remote repository to the > local repository, which seemed to have worked fine. Now I want to bring the > changes from the local repository into my working directory. > > Here is what I do > > - Hg Workbench > - Update working directory or switch revision > - I tried updating to 'tip' but it tells me that I have uncommitted changes > and > offers me to discard (the alternatives: 'default' and '2' - or '4' - don't > make any difference) > - Click on + beside the 'Options' label > - The Update button is greyed out. > - It will turn active only if I select 'Discard local changes, no backup' > !!!!!! > I don't want to do that !!! > >What can I do? > > Benoît Farley
Well, the general answer is to commit your changes and then merge with tip. But I think something might be wrong with your TortoiseHg. I'm running version 2.10.1 and if I have uncommitted changes and try to update to another revision it pops up a dialog box asking if I want to Discard, Shelve, Merge, or Cancel not "Discard, Default, 2, or 4". Alternatively, on the Update form if you click the + next to Options you should be able to check 'Always merge (when possible)' and 'Automatically resolve merge conflicts where possible'. At no point is the Update button greyed out. Mischa ________________________________ This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message. ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available. Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
