exarkun@top:~/bzr-bug-reports$ cat bug3.script.txt
bzr branch -r 1 safe-modules foo
cd foo
bzr merge -r 2..16 ../safe-modules
exarkun@top:~/bzr-bug-reports$ bash bug3.script.txt
Branched 1 revision(s).
+N  modules/
+N  modules/__init__.py
+N  modules/test/
+N  modules/test/__init__.py
 M  modules.py
 M  test_modules.py
Conflict adding files to modules.  Created directory.
Conflict because modules is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to modules/test.  Created directory.
Conflict because modules/test is not versioned, but has versioned children.  Versioned directory.
4 conflicts encountered.
exarkun@top:~/bzr-bug-reports$