[dist-bugs] salutations

[Bart Trojanowski]

* Joey Hess <joey at kitenet.net> [080709 14:25]:
> I assume you mean that needs to happen when merging two branches. But a
> bug that affects two branches can be valid on one, and wontfix in the
> other, and until they're merged, tools like git-case will allow the
> conflicting states, right?

What Aidan is talking about is merging the same development branch (via,
say, git pull) and at the same time having a conflict because the case
was modified in an incompatible way on the branch that is pulled in.

Certainly if we have multiple topic branches git-case wold track
multiple "case" branches.  While that was not implemented, IIRC we
planned on having a case branch per local code branch.

That has the shortcoming that you cannot see the state of the case on
the other branch until you switch to it -- presumably that could be
fixed with UI features.

I wold certainly be interested in exploring alternatives.

-Bart

-- 
				WebSig: http://www.jukie.net/~bart/sig/