>>805,806 ごめん、勘違いしてたみたい。これもできる?
$ bzr init repo_a
$ cd repo_a/
$ mkdir dir_a
$ cat >dir_a/a
aaa
$ bzr add dir_a/a
adding dir_a
adding dir_a/a
$ bzr commit -m "add dir_a/a"
$ bzr branch . ../repo_b
$ bzr mv dir_a dir_b
$ bzr commit -m "rename dir"
$ cat >> dir_b/a
bbb
$ bzr commit -m "add bbb"
Committed revision 3.
$ cd ../repo_b
$ bzr merge -c3 ../repo_a
M dir_a/a
All changes applied successfully.
$ bzr diff
=== modified file 'dir_a/a'
--- dir_a/a 2009-04-26 13:36:57 +0000
+++ dir_a/a 2009-04-26 13:38:12 +0000
@@ -1,1 +1,2 @@
aaa
+bbb