criss cross merge problem

[Andrew King]

Hi guys, everyone is probably bored to death with this kind of thing, but I
was surprised the following ended up with a criss-cross merge.

The first thing is ... should it? I thought it was a fairly common use case,
I am not even working on the same file in any branch.

The second thing was, if it should, how dangerous is it to ignore it?

see following script for example:

#!/bin/bash

mkdir test_repo
cd test_repo
bzr init-repo .
mkdir trunk
cd trunk
bzr init .
echo "some text in myFile" > myFile
bzr add myFile
bzr commit -m "Adding myFile to trunk"
cd ..
# work on some product a that has common libraries
bzr branch trunk productA-1.0

# work on some product B that has common libraries.
bzr branch trunk productB-1.0

# while we are at it, start a beta that combines both products.
bzr branch productB-1.0 combinedBeta
cd productA-1.0
echo "productA added a file" > productA_added
bzr add productA_added
bzr commit -m "added file to productA"
cd ..
cd combinedBeta
bzr merge ../productA-1.0
bzr commit -m "merge from productA-1.0 to beta"
cd ..
cd productB-1.0
echo "productB-1.0 added" > productB-1.0_added
bzr add productB-1.0_added
bzr commit -m "added file to productB"
cd ../combinedBeta
bzr merge ../productB-1.0
bzr commit -m "merged from productB-1.0"
cd ..
cd trunk
# merge product A back to trunk
bzr merge ../productA-1.0
bzr commit -m "merged from productA-1.0"

# merge product B back to trunk.
bzr merge ../productB-1.0
bzr commit -m "merge from productB-1.0"

# some time later, we are happy with the combined beta product
bzr merge ../combinedBeta
*criss cross merge detected*

Regards,
Andrew
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20100930/47079035/attachment-0001.htm