about conflict checker

Doug Way dway at mailcan.com
Mon Mar 8 22:35:40 UTC 2004


ducasse wrote:

> Hi Doug
>
> I'm using conflict checker to migrate morphic wrapper to 3.7.
> Now I see that when I compute the conflicts there are some conflicts 
> that I see using the browse code
> that are not caught by conflict checker.
>
> Do you only check within the udpates or check also the complete image?


The ConflictChecker only checks within the updates (actually all 
changesets) which appear in the changesorter after the update # for the 
file you are checking.  Normally, this should find all of the conflicts.

It is important that the changeset file has the correct update number 
for the image version that it is compatible with.  (Which it normally 
does, unless somebody later filed it in and filed it out of the "wrong" 
image.)  So, what is the update number in the header for the morphic 
wrapper changeset you're working on?

As an example, let's say that the morphic wrapper changeset is from 3.6 
final.  So, the header would look like this:  'From Squeak3.6 of ''6 
October 2003'' [latest update: #5424] ...'

This means that it would check for all conflicts with any changesets 
which appear above changeset #5424 in the changesorter.  (This includes 
all of the more recent updates, plus any other changesets you might have 
loaded.)

If there are changes in the image that you made in browsers, or filed in 
via .st files, or loaded via project files, I guess those wouldn't show 
up.  Perhaps that is the problem?

- Doug





More information about the Squeak-dev mailing list