Problem with merging bundled revisions in windows.

Alexander Belchenko bialix at ukr.net
Thu Oct 12 12:49:38 BST 2006


Mariusz Markowski пишет:
> I've got some problem while merging bundled revisions into my local branch:
> H:\Repo\oooo>bzr merge ..\q
> bzr: ERROR: End of line marker was not \n in bzr revision-bundle
> 
> I'm using the latest stable version for Windows (0.11). 
> Is there any other option to put all diff's into one file and send them to
> someone else?

Use gzipped_bundle plugin.
Or create bundle in this manner:

bzr bundle --output=name.patch

instead of

bzr bundle > name.patch

It's a known problem, because windows convert \n to \r\n and bzr bundles
don't like it.

--
Alexander





More information about the bazaar mailing list