trouble doing pull --rebase with mq patch applied
Created originally on Bitbucket by johansamyn (Johan Samyn)
I experienced serious trouble when updating my thg-qt working repo, while a mq patch applied, and one of the pulled csets causes a conflict to one of the files in the patch.
- from the commandline ("hg pull -r 9934 --rebase"):
No complaints, but the one conflicting line is simply filled with what was in the pulled cset. No conflict reporting, nor kdiff3 showing up to resolve.
- using thg (pull button in toolbar):
Kdiff3 came up, and clicking the merge button reported one unsolved conflict. I solved it, and saved. But afterwards that file was simply not in the mq patch anymore. CHANGES LOST !? (no, a backup, luckily)
What am I doing wrong that my patch gets screwed up so badly ? Cause I have been pulling with rebase and solving conflicts before, without experiencing this.
PS: It concerns my patch for the qqueue dialog. And the conflicting file is repowidgets.py. Pulling cset 9934 makes this happen. I can attach the patch if you need it.