Rev 5426: Fix indentations. in file:///home/vila/src/bzr/bugs/323111-orphans/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Oct 15 10:44:52 BST 2010
At file:///home/vila/src/bzr/bugs/323111-orphans/
------------------------------------------------------------
revno: 5426
revision-id: v.ladeuil+lp at free.fr-20101015094452-qpxo29hl69u0kufx
parent: v.ladeuil+lp at free.fr-20100921145503-cu4btafnawm22fe9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: deprecate-get-backup-name
timestamp: Fri 2010-10-15 11:44:52 +0200
message:
Fix indentations.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2010-09-16 09:52:31 +0000
+++ b/bzrlib/tests/test_transform.py 2010-10-15 09:44:52 +0000
@@ -2211,12 +2211,12 @@
tt = MockTransform()
name1 = self.applyDeprecated(
- symbol_versioning.deprecated_in((2, 3, 0)),
- transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
+ symbol_versioning.deprecated_in((2, 3, 0)),
+ transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
self.assertEqual('name.~1~', name1)
name2 = self.applyDeprecated(
- symbol_versioning.deprecated_in((2, 3, 0)),
- transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
+ symbol_versioning.deprecated_in((2, 3, 0)),
+ transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
self.assertEqual('name.~2~', name2)
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2010-09-13 10:14:09 +0000
+++ b/bzrlib/transform.py 2010-10-15 09:44:52 +0000
@@ -2728,8 +2728,8 @@
tt.delete_contents(trans_id)
elif kind[1] is not None:
parent_trans_id = tt.trans_id_file_id(parent[0])
- backup_name = tt._available_backup_name(name[0],
- parent_trans_id)
+ backup_name = tt._available_backup_name(
+ name[0], parent_trans_id)
tt.adjust_path(backup_name, parent_trans_id, trans_id)
new_trans_id = tt.create_path(name[0], parent_trans_id)
if versioned == (True, True):
More information about the bazaar-commits
mailing list