Good day, Tortoise HG team. On your Source Fourge support page (https://sourceforge.net/projects/tortoisehg/support) is written: "TortoiseHg says the best way to get help with its software is by sending email to its mailing list", that is why I'm sending the letter directly by email. If you can suggest a good forum to get support, please give me a link.
I have one strange problem with merging data. My situation is: 1. I work with one open-source product (http://www.nopcommerce.com). They use Mercurial as the version control tool, I work with it using TortoiseHG. 2. I want to be able to pull all recent changes from the source repository and merge them with my local changes (I have to do a lot of changes for cutomization). 3. I can't push my changes to the global repository, of course. This is how I'm trying to do this: 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 don't really know if this is my problem or some bug in the program. Please, help me to solve the situation. Thank you a lot in advance, Serge. ------------------------------------------------------------------------------ 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
