> But can we do this with rebased changesets instead of "trivial" merge > changesets?
Personally, I think merges are a Very Good idea because they bake into the tree information that is currently contained only in the pushlog. This improves bisect from my perspective, although I'll grant it might not improve other tools. Merges also preserve the differences between the code I wrote and the code that eventually got merged in after conflicts were resolved, perhaps by the sheriff. But perhaps we should table this discussion (and some of the other ones in this thread) until after we decide that this is a good idea. On Wed, Apr 3, 2013 at 7:49 PM, Jesse Ruderman <jruder...@gmail.com> wrote: > +1. > > But can we do this with rebased changesets instead of "trivial" merge > changesets? While the core of hg can handle merges, pretty much none of the > tools we rely on for understanding history (hg {log, grep, diff, bisect}) > handle them well. > > _______________________________________________ > dev-platform mailing list > dev-platform@lists.mozilla.org > https://lists.mozilla.org/listinfo/dev-platform _______________________________________________ dev-platform mailing list dev-platform@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-platform