[Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

[R. David Murray]

On Mon, 21 Mar 2011 18:33:00 +0900, "Stephen J. Turnbull" <stephen at xemacs.org> wrote:
> R. David Murray writes:
>  > On Mon, 21 Mar 2011 14:07:46 +0900, "Stephen J. Turnbull" <stephen at xemacs.org> wrote:
>  > > No, at best the DVCS workflow forces the developer on a branch to
>  > > merge and test the revisions that will actually be added to the
>  > > repository, and perhaps notice system-level anomolies before pushing.
>  > 
>  > hg does not force the developer to test, it only forces the merge.
> 
> I didn't say any VCS forces the test; I said that the workflow can (in
> the best case).  That's also inaccurate, of course.  I should have
> said "require", not "force".

The workflow in svn "can" "require" this same thing:  before committing,
you do an svn up and run the test suite.

The hg workflow "can" "not require" this as well:  before committing,
do an hg pull -u, merge heads, and *don't* run the test suite.

HG the tool does *NOT* change this aspect of things.  If this change
is to be made (tip should always be a repository state over which the
full regrtest suite has been run), then that is a *cultural* change that
we would need to make.  And could have made with svn.

We didn't.  We probably won't with hg.  Because the test suite takes
to long to run and the buildbots will do it anyway.

It's a discussion we could have, but as far as I can see it is completely
independent of the choice of tool.

Your point seems to boil down to the fact that many developers may
not have thought about the fact that committing to svn without an svn up
could mean they hadn't run regrtest over the *current* state of the repo.
This may be true, I don't know.  I did think about it.  When we moved
to hg, I did not re-think about it; nothing about the hg workflow
change forced me to re-think about it.  I did not change my habits,
and that includes not re-running the test suite after a merge heads,
unless there's a conflict (just like svn).

That is, not only did the change in the tool and consequent change in
the workflow have *zero* impact on this aspect of the way I work with
CPython, it didn't even trigger me to *think* about it.

--
R. David Murray           http://www.bitdance.com