Cherrypick without merge needed
Erik Bågfors
zindar at gmail.com
Tue Jul 1 14:26:51 BST 2008
On Tue, Jul 1, 2008 at 11:39 AM, JetMark <extrapic at extrapic.com> wrote:
> If 3 bugs use 3 seperate files then any order is (clearly)
> fine, and any combination or all 3 at once should be fine.
IMHO,
Since this is a faulty assumption, the whole argument falls.
It's quite possible that a change in one file, clearly affects the
other. For example, file A can change a method to sort out bug 123,
file B might want to use that method to solve bug 124, however since
that method had changed, you reach code that will not compile.
This is not uncommon and is why, even after a successful merge, it
needs to be verified and a commit is needed in bazaar (no fast forward
like git has for example).
It's quite clear that coming from a CVS environment you are thinking
in terms of "files" rather than looking at the full picture on how all
the code fits together, whether it's in one file or many. This is
quite common when using CVS and also to some degree when using SVN
since these are designed around the concepts of individual files,
rather than revisions that spawns multiple files (in some ways this is
less true for SVN than CVS). The newer VCSs are trying to solve that
by only allowing you to work on the whole set, unless you explicitly
tell it otherwise.
Regards,
Erik
More information about the bazaar
mailing list