Re: [RFC] UI to show a summary of problems after merge etc. (incl. tree conflicts)
From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Tue, 21 Oct 2008 16:35:23 +0200
Julian Foad wrote:
Wow, I didn't actually know we have this! That's very nice.
>>> ]]]
What would normal conflicts look like? Let's have a mixed example:
$ svn st --conflicts
Well, it looks like the third C is really redundant, since tree-conflicts
How about compressing it to this, gaining four columns of space for path
$ svn st --conflicts
Btw, isn't this one the wrong way around:
? D>M A/D/G/rho
The ? says rho is unversioned (?), so I guess the D took place in the local
D M>D A/D/G/pi
Why am I not getting this...
-- Neels Hofmeyr -- elego Software Solutions GmbH Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany phone: +49 30 23458696 mobile: +49 177 2345869 fax: +49 30 23458695 http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
|
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.