Bazaar

Is the line endings kept the same if a text conflict file is created?

Asked by Craig Hewetson

I would like to confirm the following behaviour of bazaar:

When I get a text conflict in a file that has windows line endings on a Linux machine, bazaar generates a file with the fishbone markers in it.
This file is generated with Linux line endings (I suppose because it uses the operation system's settings). While the OTHER, THIS and BASE all have windows line endings as expected.

Is this the behaviour of Bazaar.... if yes then should Bazaar not generate the file with the same line endings as the THIS file?

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
John A Meinel (jameinel) said : 		#1

Are all the lines in the wrong form, or is it just the hashbone markers that are incorrect?

Revision history for this message
Craig Hewetson (craighewetson-deactivatedaccount) said : 		#2

No the entire file's line endings are not the same as the .THIS or .OTHER files. My theory is that when the file gets created (not sure if it does get created, because of the whole file id thing) is that since I'm running in Linux the file gets created with Linux line endings and not Windows line endings ... I have to run todos on the file for it to show up correctly in qdiff.

I'll try and reproduce this behaviour in the meantime.

Revision history for this message
Craig Hewetson (craighewetson-deactivatedaccount) said : 		#3

changing the status

Revision history for this message
Martin Pool (mbp) said : 		#4

If you can reproduce this, please file a bug tagged content-filtering.
--
Martin

Can you help with this problem?

Provide an answer of your own, or ask Craig Hewetson for more information if necessary.

To post a message you must log in.