[RFC] Conflicts handling in status command

Guillermo Gonzalez guillo.gonzo at gmail.com
Mon Jul 23 04:30:24 BST 2007


Aaron Bentley wrote:

[snip]
>> 
>> #123472 is about a more compact/condensed output for conflicts.
>> My suggestion is something like this:
>> CM COPYING - Text conflict
> 
> That doesn't work.  The first column is reserved for +-R
> (add/remove/rename).  Putting C there would interfere with that.  You'd
> have to add another column.  Putting text after the filename would make
> it hard for scripts to parse the output.
> 

I understand the problem with the first column (+-R), is there any problem
to add a new column?
About the text after the filename, the conflicts are showed as "text
conflict in <filename>". 
Following the same pattern the proposed output could be modified to
something like:
 M C COPYING has text conflicts

What other posibilities do you see? 
(I'ld really like to know if this can be done)

Regards,

-- 
Guillermo Gonzalez
JID: ggonzalez -AT- jabber -DOT- org
Linux User #385261




More information about the bazaar mailing list