[darcs-users] changes -s codes

[Kari Hoijarvi]

Wow. This is total news to me, and it has potential breaking 
TortoiseDarcs2.

Since which version have codes like 'M!' been supported? I'm using 2.2.1

in my test repository: darcs whatsnew -s --look-for-adds

 ./original file.txt -> ./renamed file.txt
A ./added file.txt
M ./conflict file.txt +5
A ./last added.txt
M ./modified file.txt +1
M ./replaced file.txt r1
M ./sub dir/sub file.txt +1
M ./sub dir/sub sub dir/sub sub file.txt +1
R ./to_be_deleted.txt
A ./uncommitted folder/
A ./uncommitted folder/uncommitted file.txt
a ./ignored.txt
a ./sub dir ignored/
a ./sub dir ignored/sub file ignored.txt

There's no '!' anywhere that I have ever seen.

The line 'M ./conflict file.txt +5' results into conflict status, but 
only because I scan the file myself. I'd like to get this stuff from darcs.

This is the reason I really like XML. It's much easier to add more 
information to the status line without breaking custom parsers. And file 
name encoding would be easier too. I bet TD2 will not survive hard-core 
unicode users.

Kari

Eric Kow wrote:
> On Thu, Jun 04, 2009 at 10:26:46 -0500, Tom Hawkins wrote:
>   
>> What does the "!" mean when it's next to an "A", "M", or other codes
>> from a change summary listing?
>>     
>
> The exclamation mark indicates a conflict.
>
>   
> They are.  You'll want to look at the 'Common options to darcs commands'
> in the user's manual
>
> I hesitate to link to the latex2html output because it seems like the
> anchors are fragile, but for now:
> http://www.darcs.net/manual/node7.html#SECTION00772000000000000000
>