[RFC] Conflicts handling in status command

[Guillermo Gonzalez]

2007/7/23, Aaron Bentley <aaron.bentley at utoronto.ca>:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Guillermo Gonzalez wrote:
> > Aaron Bentley wrote:
> >
> > [snip]
> >> 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?
>
> Just the desire to keep things simple.  It's not an absolute rule,
> obviously.
>
> > About the text after the filename, the conflicts are showed as "text
> > conflict in <filename>".
>
> Actually, there are eight kinds of conflicts.
>
> Single-path conflicts
> =====================
> text conflict
> contents conflict
> parent loop
> unversioned parent
> missing parent
> deleting parent
>
> Multi-path conflicts
> =====================
> duplicate id
> duplicate filename
>

I wasn't aware of all this kinds.

>
> > What other posibilities do you see?
> > (I'ld really like to know if this can be done)
>
> I don't think what you're proposing makes sense.

Ok, Bug #123472 marked as invalid

Regards,

PD: Aaron, thank you very much for the help

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