From hallway conversation it appears many of us do struggle with merging. Here's the situation I have. I have a workspace with some changes that I have committed. I do an hg incoming and note that Karen's latest push isn't in my workspace. I do a hg pull -u and an hg merge. Then hg recommit says: abort: workspace has uncommitted changes
And an hg status shows: bash-3.2$ hg status M usr/src/cmd/slim-install/finish/install-finish Which is Karen's change. Now it seems to me that this shouldn't be. Shouldn't mercurial know that I just pulled this from the gate? I can do an hg commit and recommit and get the file to be correct but the changeset id will show up in this install-finish file and it shouldn't. So 1) this process doesn't really work or 2) there's a bug somewhere. Can someone who knows please clue us all in? Jean Dave Miner wrote: > All, > > We somehow managed to end up with multiple heads in the slim_source hg > repo after Jean's push below. Until I send out an all-clear that we've > straightened this out, please do not push any changes to the repository. > > As always, something like the following before you push is advised: > > hg incoming > If any changesets are shown, then: > hg pull -u > hg merge > hg recommit > > Thanks, > Dave > >
