/tmp/test/ > mkdir tree1
/tmp/test/ > cd tree1
/tmp/test/tree1/ > bzr init
/tmp/test/tree1/ > echo tree1 > tag
/tmp/test/tree1/ > bzr add tag
added tag
/tmp/test/tree1/ > bzr commit -m initial
Committed revision 1.
/tmp/test/tree1/ > cd ..
/tmp/test/ > bzr get tree1 tree2
Branched 1 revision(s).
/tmp/test/ > cd tree1
/tmp/test/tree1/ > mkdir dir
/tmp/test/tree1/ > echo something > dir/file1
/tmp/test/tree1/ > bzr add
added dir
added dir/file1
/tmp/test/tree1/ > bzr commit -m "add dir in tree1"
Committed revision 2.
/tmp/test/tree1/ > cd ../tree2
/tmp/test/tree2/ > mkdir dir
/tmp/test/tree2/ > echo something > dir/file2
/tmp/test/tree2/ > bzr add dir
added dir
added dir/file2
/tmp/test/tree2/ > bzr commit -m "add dir in tree2"
Committed revision 2.
/tmp/test/tree2/ > cd ..
/tmp/test/ > cd tree1
/tmp/test/tree1/ > bzr merge ../tree1
Nothing to do.
/tmp/test/tree1/ > bzr merge ../tree2
bzr: WARNING: Moved existing /tmp/test/tree1/./dir to /tmp/test/tree1/./dir.moved
1 conflicts encountered.
/tmp/test/tree1/ > bzr status
added:
  dir/
  dir/file2
renamed:
  dir => dir.moved
pending merges:
  ressu@ressukka.net 2006-03-14 add dir in tree2
/tmp/test/tree1/ > cd dir.moved
/tmp/test/tree1/dir.moved/ > ls
file1
/tmp/test/tree1/dir.moved/ > bzr move file1 ../dir/
/tmp/test/tree1/dir.moved/ > cd ..
/tmp/test/tree1/ > bzr remove dir.moved
/tmp/test/tree1/ > bzr status
removed:
  dir/
added:
  dir/
  dir/file2
renamed:
  dir/file1 => dir/file1
unknown:
  dir.moved
pending merges:
  ressu@ressukka.net 2006-03-14 add dir in tree2
/tmp/test/tree1/ > rmdir dir.moved
/tmp/test/tree1/ > ls
dir/  tag
/tmp/test/tree1/ > bzr status
removed:
  dir/
added:
  dir/
  dir/file2
renamed:
  dir/file1 => dir/file1
pending merges:
  ressu@ressukka.net 2006-03-14 add dir in tree2
/tmp/test/tree1/ > bzr commit
Committed revision 3.
/tmp/test/tree1/ > bzr status
/tmp/test/tree1/ > ls
dir/  tag
/tmp/test/tree1/ > cd dir
/tmp/test/tree1/dir/ > ls
file1  file2
/tmp/test/tree1/dir/ > cd ..
/tmp/test/tree1/ > cd ..
/tmp/test/ > cd tree2
/tmp/test/tree2/ > ls
dir/  tag
/tmp/test/tree2/ > bzr merge ../tree1
All changes applied successfully.
/tmp/test/tree2/ > ls
dir/  tag
/tmp/test/tree2/ > cd dir
/tmp/test/tree2/dir/ > ls
file1  file2
/tmp/test/tree2/dir/ > cd