Eol = lf, diff shows changes, file isn't changed after commit

Asked by Olaf van der Spek

I set eol = lf in rules. I edited a file, the diff showed all lines changed. But after commit, the working copy still contained \r\n instead of just \n. Isn't eol = lf supposed to remove the \r?

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:

This question was reopened

Revision history for this message
Jelmer Vernooij (jelmer) said :
#1

Do you have a header like "[name *]" above the "eol = lf" line in your rules file?

Revision history for this message
Olaf van der Spek (olafvdspek) said :
#2

$ cat ~/.bazaar/rules
[name *]
eol = lf
$

Revision history for this message
Jelmer Vernooij (jelmer) said :
#3

On Sun, 2011-03-06 at 21:51 +0000, Olaf van der Spek wrote:
> Question #146825 on Bazaar changed:
> https://answers.launchpad.net/bzr/+question/146825
>
> Status: Needs information => Open
>
> Olaf van der Spek gave more information on the question:
> $ cat ~/.bazaar/rules
> [name *]
> eol = lf
> $

Sorry for the long silences. I've been meaning to look at this, but
haven't found time to dive into this code, with which I am unfamiliar.

Is there perhaps somebody else who has an idea what's going wrong here?

Cheers,

Jelmer

Revision history for this message
Olaf van der Spek (olafvdspek) said :
#4

My guess is that the commit to the repo is in the right format but the WC isn't updated until you do pull / merge trunk.

Revision history for this message
Olaf van der Spek (olafvdspek) said :
#5

Hmm, wait, it wasn't supposed to be marked as answer.

Revision history for this message
Launchpad Janitor (janitor) said :
#6

This question was expired because it remained in the 'Open' state without activity for the last 15 days.

Revision history for this message
Jelmer Vernooij (jelmer) said :
#7

not expired

Revision history for this message
Launchpad Janitor (janitor) said :
#8

This question was expired because it remained in the 'Open' state without activity for the last 15 days.

Revision history for this message
Marius Kruger (amanica) said :
#9

open yet again to provide an answer

Revision history for this message
Marius Kruger (amanica) said :
#10

I don't know of any command that will update the working tree according to the rules.
But new checkouts/branches will be populated according to the rules.

from `bzr help content-filters` :
--
To reapply write converters, ensure there are no local changes,
   delete the relevant files and run ``bzr revert`` on those files.

Note: In the future, it is likely that additional options will be added
to commands to make this refreshing process faster and safer.
--

Maybe we need a bug asking for such a command.

Can you help with this problem?

Provide an answer of your own, or ask Olaf van der Spek for more information if necessary.

To post a message you must log in.