Comment 1 for bug 274430

Revision history for this message
Stephen Compall (scompall) wrote :

For this last sleepless night, I took the opportunity to consider the implementation of a DAG of threads. For example, the approach to forward-merging threads involves choosing the *longest* paths in the DAG, minimizing the number of merges required.

The problem is diffing. With a stack of patches, the base is the down-thread, so diff has a definitive base revision to compare to. This is not so with parallel parents. All the conflict resolution information is contained within the thread itself, and cannot be automatically derived to determine which parts are conflict resolution between parents and which parts are changes due to the thread itself. This isn't a problem with stacks because the conflict resolution is guaranteed to be in the down-thread.