Comment 4 for bug 494197

Revision history for this message
John A Meinel (jameinel) wrote :

The bug is that:

  We currently cannot create a .BASE file if the file doesn't exist in the unique_lca BASE revision.

There is a second bug which is touched on here, but not the explicit issue:
  We use the file text at unique_lca for BASE even when the per-file graph would indicate a better one.

I believe the former matters a lot to Guillheim because they cannot use a 3-way tool like kdiff3 to resolve the conflicts.

The latter matters less because it doesn't block functionality, but would certainly be useful because of improved accuracy.