kicad-developers team mailing list archive

[Dick Hollenbeck <dick@xxxxxxxxxxx>]

On 06/04/2012 02:17 AM, Lorenzo Marcantonio wrote:
> During merge I got a conflict on... the whole file XD
>
> The 'second half' has the CRLF endings in it. I use ~/.bazaar/rules to
> automatically convert line endings but it seems it's done *after*
> merging :(((

If this is true, then it seems just having a pristine "checkout" branch locally would give
you a fixed set of files.

You can do your merge from that pristine checkout branch rather than from the launchpad copy.


>
> (I like better the svn:eol-style behaviour: line style is handled in
> the repository, not on checkout...)

I spent some time looking for a solution the EOL problem awhile back.  But for some reason
I found that BZR simply works, and the issue has become moot.

So don't let is cost you any sleep, just always have that pristine checkout branch. 
Besides we might need it someday if launchpad ever gets hacked.  We would need a number of
copies elsewhere > 0.




>
> Is there some trick to avoid this? It impossible to do a merge this way!

Trick mentioned above.

>
> Would updating bzr help? (I'm still 2.4 so maybe it's a fixed problem)
> I'll try when I got time.
>

No.