cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Vadim Gritsenko <va...@reverycodes.com>
Subject Re: [URGENT] Fix status and sync branches before release
Date Fri, 12 Nov 2004 01:32:04 GMT
Torsten Curdt wrote:
>> Torsten, this one has neither + nor - sign. The changes have been 
>> merged. I checked it. One slight syntax difference - no need for merge.
> 
> 
> Thanks for checking.
> I also cross-checked the status files...
> 
> 
> tcurdt@shodan:~/dev $ grep 29935 cocoon-2.1.x/status.xml
>    <action dev="TC" type="add" fixes-bug="29935" due-to="Leszek Gawron" 
> due-to-email="ouzo@wlkp.org">
> 
> tcurdt@shodan:~/dev $ grep 29935 cocoon-trunk/status.xml
>    <action dev="TC" type="add" fixes-bug="29935" due-to="Leszek Gawron" 
> due-to-email="ouzo@wlkp.org">
> 
> Hm, something wrong with the diff, Vadim?

Nope, it's all right. It was "diff -u" context diff, and the line above was in 
the context, not in the diff :)

Vadim

Mime
View raw message