Mark J. Nelson wrote:
> Ok, let me summarize where I think we are with this discussion:
>
> 1. We should NOT relax our policies to allow merge changesets.
>
> 2. We need tools support to allow "trivial" merge/commit/recommit cycles
> to happen automatically.
>
> I believe that the bar on #2 is being set a little bit too low: most
> folks seem to think it's sufficient to script/automate this cycle on the
> client side (ie inside cdm.py). I think that only addresses part of the
> problem: the tedium of typing "hg pull ; hg merge ; hg commit ; hg
> recommit" arbitrarily many times. It does nothing to eliminate the need
> for the dance in the first place.
It's not clear to me that the dance is a bad thing; it's actually
telling you something that I wish I knew when using Teamware.
(Seeing the non-overlapping putback notifications that I missed while
carefully re-checking my changes and putting them back usually
freaked me out.)
> Still keeping implementation out of the picture, at least for a little
> longer: do folks agree with 1 and 2 above? If so, do they agree with my
> casting of the problem statement (ie tackle the underlying problem,
> rather than the symptomatic cycle)?
I realize people have different opinions here. If the problem is
that so-called "non-conflicting" putbacks should always be taken
without interaction, then 2 makes sense. If the problem is that it
takes too much time, keep in mind that automating it on the client
side (hopefully after user confirmation) will not just make each
cycle easier and quicker, but also reduce the likelihood of
additional conflicts.
A compromise I would probably find acceptable (since I do see the
annoyance in needing to resync due to obviously unrelated changes)
would be if a changeset could be flagged as conflicting for more than
just having an overlap in their file lists. e.g.
changes made to different files within the same directory
changes made to common header files and anything else
(sucks for the header file changer)
changes made to makefile includes and makefiles in subdirectories
Dave
