1. Yes, I will look at the cvs management
2. Yes, I think it's a problem for RGD. So we need to figure it out.
From: Danny Yoo [mailto:dyoo@...]
Sent: Monday, November 10, 2003 3:33 PM
To: Li, Jing
Subject: Re: [Gmod-pubsearch-dv] cvs update error message
On Nov 10, 2003, at 12:41 PM, Li, Jing wrote:
> Something like "<<<<<<<<<<< xxxx.jsp" or ">>>>>>>> XXX.java" in some
> code which I have to look up and clean after I got error messges when I
> typed "ant dist".
Those characters are delimiters that CVS introduces when it detects a
conflicting merge. This means that you've modified those files in the
past, and recently we've made changes to the same file. CVS responds
by marking up the file so that the conflict can be detected and
Just removing the '<<<<<<<' marks is not enough. You have to
understand how the files are being merged. Otherwise, the resulting
file will probably not do what you expect!
which explains the basics of CVS management.
> That's why I need to type "ant clean dist"?
> One more thing: In XML file I have gene name like "A2m" which is
> But after I used XML format to load data in pub_gene table the gene
> became all capital letter like "A2M" which seems not right. Is there
> anything I need to modify or fix from loading scripts?
Hmmm... this is a trickier one. Gene names, as defined by the curators
here at Carnegie, are defined to be made up of uppercased letters only.
Will this be a problem with RGD? If so, then we will need to think of
a good way to resolve this.
> And if use bulk_load_gene.pl there should not do anything about "term
> table", right?
Right, you won't need to touch the term table, as the bulk gene loader
should do it for you.