Re: [galaxy-dev] Mercurial wants to overwrite my job_conf.xml

2014-02-27 Thread Nate Coraor
Hi Carrie, .hgignore should not affect files that you have explicitly tracked (e.g. with `hg add job_conf.xml`) - if the file is tracked, Mercurial will attempt to update and patch the working copy if there are upstream changes. Also, it looks like your current tip includes neither .hgignore or

Re: [galaxy-dev] Mercurial wants to overwrite my job_conf.xml

2014-02-27 Thread Ganote, Carrie L
] Mercurial wants to overwrite my job_conf.xml Hi Carrie, .hgignore should not affect files that you have explicitly tracked (e.g. with `hg add job_conf.xml`) - if the file is tracked, Mercurial will attempt to update and patch the working copy if there are upstream changes. Also, it looks like

Re: [galaxy-dev] Mercurial wants to overwrite my job_conf.xml

2014-02-27 Thread Nate Coraor
: galaxy-dev@lists.bx.psu.edu Subject: Re: [galaxy-dev] Mercurial wants to overwrite my job_conf.xml Hi Carrie, .hgignore should not affect files that you have explicitly tracked (e.g. with `hg add job_conf.xml`) - if the file is tracked, Mercurial will attempt to update and patch the working copy

[galaxy-dev] Mercurial wants to overwrite my job_conf.xml

2014-02-26 Thread Ganote, Carrie L
Hi Galaxy devs, I had an issue recently where I must have messed up my .hgignore file or done something terrible to my repository. I created a bitbucket and pushed my instance to it. I then pulled that onto my laptop and hooked it all up with Eclipse. After I was happy with my code, I pushed