Re: [RFC] UI to show a summary of problems after merge etc. (incl. tree conflicts)
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 20 Oct 2008 19:57:06 +0100
On Mon, 2008-10-20 at 19:01 +0100, Stefan Sperling wrote:
Heh. Sure. Yes, that's what it means.
I was wondering if we could include revision numbers of the changes:
(D r34567 -> M r34567)
(I'd have to think about whether we're printing old/new/theirs/mine or
and/or whether we could include text-mod and prop-mod indicators in each
(D_ -> _M) foo # meaning: delete conflicted with prop-mod
to be more precise. Especially as the non-tree conflict indication could
(MM -> _M) foo # meaning: text applied ok, prop mod conflicted
Or something like that.
We aren't perhaps storing enough details of the tree conflict at the
> I like the idea of parentheses, since it visually groups the details
I don't want to spend much time thinking about how to represent non-tree
> > Note also that a briefer summary of such problems has just been
Yes.
- Julian
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.