Hand waving solutions without seeing the bk code ...
Don't maintain both versions of the changes.
Everybody except the person with the uncollapsed set only sees the
collapsed set, no problem there.
The person with the uncollapsed set only has one version of the
changes, in the uncollapsed set.
Identify each externally visible patchset with a unique id, you
probably already do this.
Define a meta patchset entry which maps the uncollapsed line of patches
to the collapsed set. That is, don't duplicate the changes, add a
mapping instead.
The meta entry maps the externally visible patchset to the internal set
by listing just the start and end point of the LOD. These are the
entries that would be given to export patch.
Add a global repository option, show/hide detail. The default is show
detail, the current behaviour.
For show detail, you cannot use meta patchset entries. Everything is
visible to the rest of the world.
For hide detail, you must define meta entries for what you want to be
visible, the rest of the world can only see what you expose. That is,
you cannot publish some detail entries and some meta entries, you must
choose one or the other at the repository level.
Meta sets are single level, no collapse within collapse. A meta set is
externally visible, to collapse a meta set into a meta-meta set is
equivalent to rewriting the distributed bk history, don't allow that.
No duplication of changes. No rewriting of bk history. Users who want
to hide their detail changes and only expose the result can do so.
Users who only check in working (as opposed to hacking) code are not
affected. Users who want the extra flexibility incur the cost of
defining meta sets before they can publish anything.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/