If I merge this branch with trunk, both new tests fail due to script test output now having to be specified:
Traceback (most recent call last):
...
File "C:\bzr\bzr\tags-commit-propagation-603395-2.2\bzrlib\tests\blackbox\test_tags.py", line 140, in test_commit_in_heavyweight_checkout_copies_tags_to_master
""")
File "C:\bzr\bzr\tags-commit-propagation-603395-2.2\bzrlib\tests\script.py", line 514, in run_script
return ScriptRunner().run_script(test_case, script_string)
File "C:\bzr\bzr\tags-commit-propagation-603395-2.2\bzrlib\tests\script.py", line 209, in run_script
self.run_command(test_case, cmd, input, output, error)
File "C:\bzr\bzr\tags-commit-propagation-603395-2.2\bzrlib\tests\script.py", line 228, in run_command
raise AssertionError(str(e) + " in stdout of command %s" % cmd)
AssertionError: texts not equal:
+ Created a standalone tree (format: 2a)
in stdout of command ['bzr', 'init', 'master']
Don't really like the duplication of the setup steps either, it's hard enough to read already without this block twice:
If I merge this branch with trunk, both new tests fail due to script test output now having to be specified:
Traceback (most recent call last): bzr\tags- commit- propagation- 603395- 2.2\bzrlib\ tests\blackbox\ test_tags. py", line 140, in test_commit_ in_heavyweight_ checkout_ copies_ tags_to_ master bzr\tags- commit- propagation- 603395- 2.2\bzrlib\ tests\script. py", line 514, in run_script ).run_script( test_case, script_string) bzr\tags- commit- propagation- 603395- 2.2\bzrlib\ tests\script. py", line 209, in run_script run_command( test_case, cmd, input, output, error) bzr\tags- commit- propagation- 603395- 2.2\bzrlib\ tests\script. py", line 228, in run_command str(e) + " in stdout of command %s" % cmd)
...
File "C:\bzr\
""")
File "C:\bzr\
return ScriptRunner(
File "C:\bzr\
self.
File "C:\bzr\
raise AssertionError(
AssertionError: texts not equal:
+ Created a standalone tree (format: 2a)
in stdout of command ['bzr', 'init', 'master']
Don't really like the duplication of the setup steps either, it's hard enough to read already without this block twice:
+ $ bzr init master
+ $ cd master
+ $ bzr commit -m "Initial commit." --unchanged
+ $ cd ..
+ $ bzr checkout master child
+ $ bzr branch master fork
+ $ cd fork
+ $ bzr commit -m "Commit in fork." --unchanged
+ $ bzr tag new-tag