On 05/07/2012 04:01 PM, Serge Gusev wrote: > 1. I have cloned repository locally > 2. After some changes I make commit (without push) to my disk. No problem > yet. > 3. Then I pull fresh version from the repository. This step creates a new > head, of couse. > 4. I select the new head and implement "Merge with local". > 5. TortoiseHG implements mergin, offers to do commit, I do it. No errors, no > warnings, everything seems to be OK. > > After step 4 I expect one head (I have it) with merged changes. But there is > no real merge! All new files are unchanged locally. When I do "Diff to > local", I see a lot of changes and have to merge them manually.
I cannot guess what happened, sorry... So, if possible, could you provide the output log shown at "Merging..." page? And which TortoiseHg version are you using? Regards, ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
