g+
g+ Communities
Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  2010  <20112012  2013  2014  Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  <20112012  2013  2014 
<== Date ==> <== Thread ==>

Subject: Re: bazaar end of line conversion
From: Andrew Johnson <anj@aps.anl.gov>
To: "Jeff Hill" <johill@lanl.gov>
Cc: EPICS core-talk <core-talk@aps.anl.gov>
Date: Wed, 5 Jan 2011 11:34:36 -0600
Hi Jeff,

On Tuesday 04 January 2011 18:32:05 you wrote:
>
> I am actually not certain if I asked this question before, but in any case,
> I see quite a few warning popups in the ms ide about end of line
> terminations being inconsistent which can have some impact on productivity.
> So I am wondering if we have chosen the "native" option as described on
> this web page.
>
> http://doc.bazaar.canonical.com/development/en/user-reference/eol-help.html

Unlike with CVS this configuration has to be set by each developer that needs 
windows line-endings; the %BZR_HOME%/bazaar/2.0/rules file that the above page 
talks about is not stored inside the repository or your working directory, I 
believe it's somewhere under your Windows home directory.  As the page says, 
if a value is not given then 'exact' is used, so you get the line endings 
exactly as stored in the repository.

> Sorry to ask this question twice if that turns out to be the case, but
> thought this issue should be addressed soon if its solvable.

I don't remember you asking about it before, but I think you'll have to fix it 
yourself if you want Windows line endings in your working files.  After you 
add the necessary rule(s) you will have to check out your working tree again 
to get the line-endings in your working files changed, or you can use these 
commands from the <base> directory to remove and re-create them all (unless 
you're using a light checkout, where this won't work):

make distclean
bzr clean-tree		(deletes all unknown files)
bzr shelve --all		(saves any uncommitted changes)
bzr remove-tree		(removes working files)
bzr checkout .		(recreate working files)
bzr unshelve  		(restore uncommitted changes)

By the way my rules file currently contains the following settings to 
configure keyword expansion, but you'd need my version of the Bazaar keywords 
plugin to use them; the "official" keywords plugin is broken.

-------------------------
[name *.html *.php *.xml]
keywords = xml_escape

[name *]
keywords = on
-------------------------

You can get my version of the keywords plugin if you want it by doing this:

cd %BZR_HOME%/bazaar/2.0/plugins
bzr co lp:~anj/bzr-keywords/fix-505038 keywords

then run 'bzr plugins' to check that it's seeing the plugin.

HTH,

- Andrew

PS: In addition to the bug that I subscribed you to earlier, Alex Chen also 
filed 3 others that look to be related and cover Win32 OSD code which you 
understand a lot better than I do.  If you want to receive all bug emails like 
Ralph and I currently do you should go to the URL below and check the "I want 
to receive these notifications by e-mail." box:
  https://bugs.launchpad.net/epics-base/+subscribe
-- 
If a man is offered a fact which goes against his instincts, he will
scrutinize it closely, and unless the evidence is overwhelming, he will
refuse to believe it.  If, on the other hand, he is offered something
which affords a reason for acting in accordance to his instincts, he
will accept it even on the slightest evidence.  -- Bertrand Russell


Replies:
Re: bazaar end of line conversion J. Lewis Muir

Navigate by Date:
Prev: RE: EPICS internals talks? Jeff Hill
Next: Re: bazaar end of line conversion J. Lewis Muir
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  <20112012  2013  2014 
Navigate by Thread:
Prev: RE: EPICS internals talks? Jeff Hill
Next: Re: bazaar end of line conversion J. Lewis Muir
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  <20112012  2013  2014 
ANJ, 02 Feb 2012 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· EPICSv4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·