managing multi-version development with mercurial

[Alexander Schatten]

Sorry, now I have to add a probably dumb question to this thread. Actually about the "merge" suggestions. I wonder how merges could help; let me explain my question:

Assume 

(1) I have V1, then code develops to V2.

(2) Now, a bugfix is needed in V1 that generates V1.0 --> V1.1; this bugfix is *not* needed in V2, because it already changed to V2.2 and this bugfix is not relevant any more

(3) I Update V2.2 on multiple steps to V2.5

(4) Another bugfix is needed and makes:V1.1 --> V1.2; now THIS bugfix is also needed in V2.5

Now, these two branches are significantly different. A merge from 1.2 --> 2.5 would, as I understand it also add the changes from 1.0 --> 1.1, and these I do most likely not want in Version 2.


I believe, this is a pretty usual scenario, no?

Do I get something wrong here?


thank you very much.




Alex