Strategies for push/merge problem?

Sean Kelley sean.v.kelley at gmail.com
Wed Jul 23 13:16:58 CDT 2008


On Tue, Jul 22, 2008 at 2:29 PM, Risto Kankkunen
<risto.kankkunen at gmail.com> wrote:
> Douglas Philips <dgou <at> mac.com> writes:
>> Sounds like you want to have intermediate commits collapsed before
>> they are pushed. That is certainly one policy. Another policy is that
>> a set of changesets which are pushed together should not fail the
>> testsuite. There is work going on with the group-ing extension which
>> formalizes this since some find it is useful to have the extra meta-
>> data made explicit.
>
> Regulating what can be pushed or committed goes against many of the benefits of
> DVCS and can make it harder to review the history later. The grouping extension
> could indeed be used to collect incremental changes into coherent chunks.
>
> However, I'm wondering couldn't you use branches in Mercurial for the same
> thing: develop, commit and push your changes to a separate branch until they are
> stable enough and pass the test suite before merging into the mainline. Anyone
> care to comment does this work in practice?

Unlike GIT, I cannot remove a branch.  There is a local branch
extension, but it is not being further developed.

Sean

>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>


More information about the Mercurial mailing list