StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POHow to merge in mercurial by TortoiseHG?
text
Body
copied!<p>I have two machines, window 7 with TortoiseHG 2.6 and Linux with TortoiseHG 1.5. I use bitbucket as a website to hold my centralized repository. The window machine associates with bitbucket user account, Cassie-win and the linux machine associates with bitbucket user account, Cassie-linux. Here are the steps I have performed.</p> <ul> <li>created a empty centralized repository at butbucket Cassie-linux account</li> <li>create two files locally, file1.txt and file2.txt on linux machines and push them to the Cassie-linux account.</li> <li>Add user Cassie-win to the repository</li> <li>Clone the repository to the window machine, make changes on file2.txt there and push it back to the centralized repository.</li> <li>Meanwhile, also make some changes on the file2.txt which is on the linux machine and commit locally</li> <li>Then I pull changes from the centralized repository at Cassie-linux account to my local linux machine. Now my linux local repository has two heads because of different contents in file2.txt and I would like to merge them together. </li> </ul> <p>I used the "merge with" tool of TortoiseHG on my linux machine to merge these two heads. However, it kept failing to do so. I tried like a hundreds times and didn't know where I got it wrong. Both file1 and file2 are test files that have only three lines. I also used a command "hg resolve file2.txt" to check the error. However, it only showed that mergeing fails and didn't shown much information. Does anyone know how to use TortoiseHG merge tool to merge two heads ? And what could be the problem to stop TortoiseHG merging two heads ? </p> <p>I embedded the screenshot which I took on the Linux machine which has TortoiseHg 1.5.<br> <img src="https://i.stack.imgur.com/qm7cl.png" alt="enter image description here"></p> <p>I right clicked the "from Cassie-win account" and it has "merge with" option. Then, I clicked the "merge" option with "merge" tool but it failed with error messages as below. <img src="https://i.stack.imgur.com/hOgRI.png" alt="enter image description here"></p> <p>Thank you very much,</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload