Congrats on tracking this nasty down.
I just have 2 comments that I think can be addressed when merging.
1) I suggest adding a comment at the end of your blackbox test_push_with_revspec
+++ bzrlib/tests/blackbox/test_push.py 2012-06-10 23:32:32 +0000
@@ -445,20 +445,22 @@ class TestPush(tests.TestCaseWithTranspo
+ $ bzr st ../other # checking that file is not created (bug #484516)
2) You are adding a trailing space here..
+++ bzrlib/workingtree.py 2012-06-10 23:32:32 +0000
@@ -527,21 +527,22 @@ class WorkingTree(bzrlib.mutabletree.Mut
+ merge.transform_tree(tree, <--
Congrats on tracking this nasty down.
I just have 2 comments that I think can be addressed when merging.
1) I suggest adding a comment at the end of your blackbox test_push_ with_revspec tests/blackbox/ test_push. py 2012-06-10 23:32:32 +0000 tests.TestCaseW ithTranspo workingtree. py 2012-06-10 23:32:32 +0000 bzrlib. mutabletree. Mut _tree(tree, <--
+++ bzrlib/
@@ -445,20 +445,22 @@ class TestPush(
+ $ bzr st ../other # checking that file is not created (bug #484516)
2) You are adding a trailing space here..
+++ bzrlib/
@@ -527,21 +527,22 @@ class WorkingTree(
+ merge.transform