Another diff Viewer
Brian de Alwis
bsd at cs.ubc.ca
Fri Feb 20 23:34:38 GMT 2009
Hi Nathan.
I have similar problems when diffing files encoded in UTF-16. I
believe its your diff tool that's actually complaining, not bzr.
Fortunately you can use bzr diff's --diff-options to add options to
whatever diff program bzr is currently configured to use; standard
diff(1) seems to support "-a" to force the files to be treated as
ASCII. So you should be able to do something like:
$ bzr diff --diff-options="-a"
Alternatively you could use the --using option to specify another diff
tool entirely.
Brian.
On 20-Feb-2009, at 4:42 PM, Nathan Samson wrote:
> Hi all,
>
> I'm a student computer science at the university and we are using
> Oberon-2 as programming language. Now we have a project (Software
> engeneering) that we work on, and we store our code in a bazaar
> repository. The problem is the Oberon system saves all files as Binary
> data, so we can't view diffs. Since these binary files are mostly
> normal files (only at the top their are some binary bits, other parts
> are ASCII with \r as line ending (technically binary data could be in
> the middle of the file but we don't use that)).
>
> My question: can I modify bzr with a plugin (or commandline options)
> so that I can view a diff? Stripping the first bytes of the file +
> line ending conversion should be enough to make it work. (or are their
> any existing plugins to use)?
>
> Thanks for any help...
>
> PS: If you are wondering why oberon saves source code as Binary files
> => You can add code formatting (colors/fonts/more advanced stuff and
> so on in the file, so it is binary),
> their is now way to store source code in oberon as ASCII (as far as
> I know)
> PPS: Yeah I dislike that system (Oberon is pretty outdated too), but
> we need to use it...
--
"Amusement to an observing mind is study." - Benjamin Disraeli
More information about the bazaar
mailing list