Comment 7 for bug 307316

Here's a bash script that automates the test case in the original report. It uses gzipped text files to make binary files, rather than gnumeric.

#!/bin/bash
set -e
bzr init /tmp/mainline
echo 'base' | gzip -c > /tmp/mainline/test.gz
bzr add /tmp/mainline/test.gz
(cd /tmp/mainline && bzr ci -m "Test")

bzr co /tmp/mainline /tmp/checkout
echo 'checkout' | gzip -c > /tmp/checkout/test.gz
(cd /tmp/checkout && bzr ci -m "test change" --local)

echo 'mainline' | gzip -c > /tmp/mainline/test.gz
(cd /tmp/mainline && bzr ci -m "Mainline change")

cd /tmp/checkout
bzr update
bzr st