How to merge branches and specific 'bugfix' changesets across branches?

If stable and dev are named branches in the same repository, then to merge dev into stable you switch to stable and do a merge: $ hg up stable $ hg merge dev You might want to check out the docs for hg resolve in case there are merge conflicts that can't be resolved About moving a specific changeset to another branch you might want to check out hg transplant.

If stable and dev are named branches in the same repository, then to merge dev into stable, you switch to stable and do a merge: $ hg up stable $ hg merge dev You might want to check out the docs for hg resolve in case there are merge conflicts that can't be resolved. About moving a specific changeset to another branch you might want to check out hg transplant.

Well thanks for the answer.. I am still a little confused. My dev branch changes a ton of code and there were be a ton of conflicts. I would simply want to do a 'fore merge' is that a good thing?

Also which one will be forced? How do I make sure that stable code is the one that is replaced and not the dev code? – Achshar Aug 15 at 2:00 1 hg resolve ... if you are in the stable branch (you did hg up stable), then when you merge dev it will merge from dev -> stable – rm.

Aug 15 at 2:04 from what I understand from the docs, in hg resolve I will resolve the conflicts line by line. But in my case I just want to do a force merge. I don't need anything from he stable branch anymore.So can I -f force merge all my dev code to the stable so that it overwrites the stable code?

– Achshar Aug 15 at 2:10 If there are conflicts on merge, it means you were also committing code to the stable branch. If you absolutely don't want the stable branch, why not just use a clone and replace the older repository when it is no longer required. – rm.

Aug 15 at 2:19 well I don't need stable's code, but I would like to keep the history. So how can I force my changes from dev to stable and merge them? – Achshar Aug 15 at 2:24.

I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.