Docs branch merge fallout

[Gervase Markham]

It seems my docs branch merge has caused some trouble in the VCS history.

Is it enough trouble that we want to back up and fix it, and deal with
the fallout of fixing up the BZR and CVS mirrors manually, and deal with
the fact that some people's checkouts may break (we'd have to manually
fix those on landfill, for example)? We can recruit the help of some of
our VCS experts who are here in Portland.

Whether we do that or not, I'd also like to understand why merging a
branch can be so destructive to the bzr and CVS mirrors. (Separate from
the problem of leaving WIP commits in the history, which I agree is
ugly.) I would hope that development on feature branches would be
something we can do in the future; is that impossible as long as we
maintain bzr and CVS mirrors?

Gerv
_______________________________________________
dev-apps-bugzilla mailing list
dev-apps-bugzilla at lists.mozilla.org
https://lists.mozilla.org/listinfo/dev-apps-bugzilla