Cherrypick without merge needed

[JetMark]

>I lied slightly. just because the modified versions of 2 files is fine, and
the unmodified versions are fine, does not mean that unmodified will always
work with modified.

What you say Erik can certainly be true, but in most cases is not, so does
not invalidate the argument. The quote above is meant to allow of this
possibility.  Developers after all have a good idea what files affect their
bugs, but when a merge generates a conflict that is caused by the merge
process, that is a problem for me (The CM), not the developer.  And my point
is that weather or not you get a conflict can depend on what order you merge
in. Weather you are at risk or not from this can be worked out in advance. I
can even write code to do it. But Bazaa does not help with this. At all. By
doing it the CVS way its simplified, but the issue is still there. (And, not
I am not sugesting that CVS is better or that this is the right way to do
it.) 

The bottom line is that if developers have to look at the CM's merge
problems as well as their own then this is more work for them. (Even the CM
cannot decide really what order to merge bugs in as this is determined by
release schedule. What he would like is to able to say a particular
combination of change sets is unsafe.) 

And thank you Erik for responding to this discussion. I am trying to get my
head round this and understand why the Bazaar writers and others do not see
this as important. Possibly point out something they have missied because
this is not the way they do things. But to me it looks close to being a show
stopper. 




-- 
View this message in context: http://www.nabble.com/Cherrypick-without-merge-needed-tp18212682p18221505.html
Sent from the Bazaar - General Discussion mailing list archive at Nabble.com.