[Clam-devel] Re: adding the documents to the scheme of SilenceDetector

David García Garzón dgarcia at iua.upf.edu
Tue May 27 06:05:20 PDT 2008


I applied the patches. I did some layout changes to the documentation one. 
Hope you like them but they might provoque a conflict in your repository when 
updating.

C src/SilenceDetector/main.cxx   (The C means conflict)

A conflict generates a '.mine' file with your previous version, a '.r11421' 
file with the version i commited and the actual file with a proposed merging 
marking the conflict locations like this:

>>>>> mine
your changes conflicting with
======
the ones in the repository
<<<<< r11421

you should edit the file to fit your taste and then execute

svn resolved src/SilenceDetector/main.cxx

that command will clear all the conflict related files and marks the file 
ready to be commited if you want.

BTW, you may end up editing files in CLAM/src so it's better if you generate 
the patches from an upper level to comprise all the repository.


On Dimarts 27 Maig 2008, JunJun wrote:
> Adding the documents,
> and the following is dumping pool to XML.
> By far, it seems that the "schema.FillDescriptionScheme(descriptionScheme)"
> has messed up the instance of  "descriptionScheme". The next is to fix the
> bug.
>
>
> ----- Original Message -----
> From: "JunJun" <wangjun at dsp.ac.cn>
> To: <clam-devel at llistes.projectes.lafarga.org>
> Cc: "David García Garzón" <dgarcia at iua.upf.edu>
> Sent: Tuesday, May 27, 2008 6:42 PM
> Subject: adding the Uri to the scheme of SilenceDetector
>
> > adding the Uri
> >
> > ----- Original Message -----
> > From: "JunJun" <wangjun at dsp.ac.cn>
> > To: <clam-devel at llistes.projectes.lafarga.org>
> > Cc: "David García Garzón" <dgarcia at iua.upf.edu>
> > Sent: Tuesday, May 27, 2008 6:40 PM
> > Subject: adding the segmentation to the scheme of SilenceDetector
> >
> >> Hi,
> >> I resend the patches from the step of adding the segmentation.
> >> Sorry for the carelessness.
> >>
> >> ----- Original Message -----
> >> From: "JunJun" <wangjun at dsp.ac.cn>
> >> To: <clam-devel at llistes.projectes.lafarga.org>
> >> Cc: "David García Garzón" <dgarcia at iua.upf.edu>
> >> Sent: Saturday, May 24, 2008 3:56 PM
> >> Subject: Re: patch of a simple schema with a segmentation and no
> >> attribute
> >>
> >>> Implement the command line options
> >>>      *and add an enumerated attribute  :)
> >>>
> >>>
> >>> ----- Original Message -----
> >>> From: "JunJun" <wangjun at dsp.ac.cn>
> >>> To: <clam-devel at llistes.projectes.lafarga.org>
> >>> Cc: "David García Garzón" <dgarcia at iua.upf.edu>
> >>> Sent: Saturday, May 24, 2008 11:11 AM
> >>> Subject: Re: patch of a simple schema with a segmentation and no
> >>> attribute
> >>>
> >>>> a.. Create a pool according to the schema
> >>>> a.. Populate the pool with dummy data
> >>>>
> >>>> ----- Original Message -----
> >>>> From: "JunJun" <wangjun at dsp.ac.cn>
> >>>> To: <clam-devel at llistes.projectes.lafarga.org>
> >>>> Cc: "David García Garzón" <dgarcia at iua.upf.edu>
> >>>> Sent: Saturday, May 24, 2008 10:03 AM
> >>>> Subject: patch of a simple schema with a segmentation and no attribute
> >>>>
> >>>>> Code a simple schema with a segmentation and no attribute
> >>>>>
> >>>>> ----- Original Message -----
> >>>>> From: "David García Garzón" <dgarcia at iua.upf.edu>
> >>>>> To: <clam-devel at llistes.projectes.lafarga.org>
> >>>>> Cc: "JunJun" <wangjun at dsp.ac.cn>
> >>>>> Sent: Friday, May 23, 2008 11:27 PM
> >>>>> Subject: Re: [Clam-devel] patch of dumping scheme to XML



-- 
David García Garzón
(Work) dgarcia at iua dot upf anotherdot es
http://www.iua.upf.edu/~dgarcia
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.clam-project.org/pipermail/clam-devel-clam-project.org/attachments/20080527/3b91c3ae/attachment.sig>


More information about the clam-devel mailing list