Update with local changes (automerging) no longer works
Created originally on Bitbucket by f0ff886f (Matt Rusiniak)
This is bizarre, but for some reason one of our basic workflows has stopped working. Until today our normal workflow was:
Edit things locally, when we're ready to commit we pull the latest changes from the server, then we update to tip by right clicking the tip and selecting "Update", and in the update dialog we leave "Always merge" selected.
This is how the dialog looks:
Until today, it worked perfectly. We'd layer our changes on the latest revision before comitting, and that way we'd never have to deal with any rebasing or things like that (if there was a conflict when merge we'd resolve locally anyways since the update would fail).
Now, I get this dialog:
However, if I just go to the terminal and try using
hg update, it works perfectly (and then TortoiseHg Workbench happily shows the change).
What's odd is this changed across all TortoiseHg versions (3.8.1, 4.6.1 and 4.8 in our pool of PCs)! Actually, I think the behaviour on non 4.8 was intended (due to some branching), so I will keep this report specific to 4.8. I'm sure its some ID10T problem, but do you have any idea what suddenly caused this? I've made no changes to the main repo server, and definitely I haven't touched other clients either.