171
159
transform.finalize()
172
160
transform.finalize()
174
def test_apply_informs_tree_of_observed_sha1(self):
175
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
176
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
179
orig = self.wt._observed_sha1
180
def _observed_sha1(*args):
183
self.wt._observed_sha1 = _observed_sha1
185
self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
188
def test_create_file_caches_sha1(self):
189
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
190
trans_id = trans.create_path('file1', root)
191
trans.create_file(contents, trans_id, sha1=sha1)
192
st_val = osutils.lstat(trans._limbo_name(trans_id))
193
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
194
self.assertEqual(o_sha1, sha1)
195
self.assertEqualStat(o_st_val, st_val)
197
def test__apply_insertions_updates_sha1(self):
198
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
199
trans_id = trans.create_path('file1', root)
200
trans.create_file(contents, trans_id, sha1=sha1)
201
st_val = osutils.lstat(trans._limbo_name(trans_id))
202
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
203
self.assertEqual(o_sha1, sha1)
204
self.assertEqualStat(o_st_val, st_val)
205
creation_mtime = trans._creation_mtime + 10.0
206
# We fake a time difference from when the file was created until now it
207
# is being renamed by using os.utime. Note that the change we actually
208
# want to see is the real ctime change from 'os.rename()', but as long
209
# as we observe a new stat value, we should be fine.
210
os.utime(trans._limbo_name(trans_id), (creation_mtime, creation_mtime))
212
new_st_val = osutils.lstat(self.wt.abspath('file1'))
213
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
214
self.assertEqual(o_sha1, sha1)
215
self.assertEqualStat(o_st_val, new_st_val)
216
self.assertNotEqual(st_val.st_mtime, new_st_val.st_mtime)
218
def test_new_file_caches_sha1(self):
219
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
220
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
222
st_val = osutils.lstat(trans._limbo_name(trans_id))
223
o_sha1, o_st_val = trans._observed_sha1s[trans_id]
224
self.assertEqual(o_sha1, sha1)
225
self.assertEqualStat(o_st_val, st_val)
227
def test_cancel_creation_removes_observed_sha1(self):
228
trans, root, contents, sha1 = self.get_transform_for_sha1_test()
229
trans_id = trans.new_file('file1', root, contents, file_id='file1-id',
231
self.assertTrue(trans_id in trans._observed_sha1s)
232
trans.cancel_creation(trans_id)
233
self.assertFalse(trans_id in trans._observed_sha1s)
235
162
def test_create_files_same_timestamp(self):
236
163
transform, root = self.get_transform()
237
164
self.wt.lock_tree_write()
285
212
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
286
213
self.assertRaises(ValueError, transform.fixup_new_roots)
288
def test_add_unversioned_root(self):
289
transform, root = self.get_transform()
290
new_trans_id = transform.new_directory('', ROOT_PARENT, None)
291
transform.fixup_new_roots()
292
self.assertNotIn(transform.root, transform._new_id)
294
def test_remove_root_fixup(self):
295
transform, root = self.get_transform()
296
old_root_id = self.wt.get_root_id()
297
self.assertNotEqual('new-root-id', old_root_id)
298
transform.delete_contents(root)
299
transform.unversion_file(root)
300
transform.fixup_new_roots()
302
self.assertEqual(old_root_id, self.wt.get_root_id())
304
transform, root = self.get_transform()
305
new_trans_id = transform.new_directory('', ROOT_PARENT, 'new-root-id')
306
new_trans_id = transform.new_directory('', ROOT_PARENT, 'alt-root-id')
307
self.assertRaises(ValueError, transform.fixup_new_roots)
309
def test_apply_retains_root_directory(self):
310
# Do not attempt to delete the physical root directory, because that
312
transform, root = self.get_transform()
314
transform.delete_contents(root)
315
e = self.assertRaises(AssertionError, self.assertRaises,
316
errors.TransformRenameFailed,
318
self.assertContainsRe('TransformRenameFailed not raised', str(e))
320
215
def test_hardlink(self):
321
216
self.requireFeature(HardlinkFeature)
322
217
transform, root = self.get_transform()
1631
1505
return template % ('<' * 7, tree, '=' * 7, merge, '>' * 7)
1634
class TestInventoryAltered(tests.TestCaseWithTransport):
1636
def test_inventory_altered_unchanged(self):
1637
tree = self.make_branch_and_tree('tree')
1638
self.build_tree(['tree/foo'])
1639
tree.add('foo', 'foo-id')
1640
with TransformPreview(tree) as tt:
1641
self.assertEqual([], tt._inventory_altered())
1643
def test_inventory_altered_changed_parent_id(self):
1644
tree = self.make_branch_and_tree('tree')
1645
self.build_tree(['tree/foo'])
1646
tree.add('foo', 'foo-id')
1647
with TransformPreview(tree) as tt:
1648
tt.unversion_file(tt.root)
1649
tt.version_file('new-id', tt.root)
1650
foo_trans_id = tt.trans_id_tree_file_id('foo-id')
1651
foo_tuple = ('foo', foo_trans_id)
1652
root_tuple = ('', tt.root)
1653
self.assertEqual([root_tuple, foo_tuple], tt._inventory_altered())
1655
def test_inventory_altered_noop_changed_parent_id(self):
1656
tree = self.make_branch_and_tree('tree')
1657
self.build_tree(['tree/foo'])
1658
tree.add('foo', 'foo-id')
1659
with TransformPreview(tree) as tt:
1660
tt.unversion_file(tt.root)
1661
tt.version_file(tree.get_root_id(), tt.root)
1662
foo_trans_id = tt.trans_id_tree_file_id('foo-id')
1663
self.assertEqual([], tt._inventory_altered())
1666
1508
class TestTransformMerge(TestCaseInTempDir):
1668
1510
def test_text_merge(self):
2209
2039
self.assertEqual('file.moved', target.id2path('lower-id'))
2210
2040
self.assertEqual('FILE', target.id2path('upper-id'))
2212
def test_build_tree_observes_sha(self):
2213
source = self.make_branch_and_tree('source')
2214
self.build_tree(['source/file1', 'source/dir/', 'source/dir/file2'])
2215
source.add(['file1', 'dir', 'dir/file2'],
2216
['file1-id', 'dir-id', 'file2-id'])
2217
source.commit('new files')
2218
target = self.make_branch_and_tree('target')
2220
self.addCleanup(target.unlock)
2221
# We make use of the fact that DirState caches its cutoff time. So we
2222
# set the 'safe' time to one minute in the future.
2223
state = target.current_dirstate()
2224
state._cutoff_time = time.time() + 60
2225
build_tree(source.basis_tree(), target)
2226
entry1_sha = osutils.sha_file_by_name('source/file1')
2227
entry2_sha = osutils.sha_file_by_name('source/dir/file2')
2228
# entry[1] is the state information, entry[1][0] is the state of the
2229
# working tree, entry[1][0][1] is the sha value for the current working
2231
entry1 = state._get_entry(0, path_utf8='file1')
2232
self.assertEqual(entry1_sha, entry1[1][0][1])
2233
# The 'size' field must also be set.
2234
self.assertEqual(25, entry1[1][0][2])
2235
entry1_state = entry1[1][0]
2236
entry2 = state._get_entry(0, path_utf8='dir/file2')
2237
self.assertEqual(entry2_sha, entry2[1][0][1])
2238
self.assertEqual(29, entry2[1][0][2])
2239
entry2_state = entry2[1][0]
2240
# Now, make sure that we don't have to re-read the content. The
2241
# packed_stat should match exactly.
2242
self.assertEqual(entry1_sha, target.get_file_sha1('file1-id', 'file1'))
2243
self.assertEqual(entry2_sha,
2244
target.get_file_sha1('file2-id', 'dir/file2'))
2245
self.assertEqual(entry1_state, entry1[1][0])
2246
self.assertEqual(entry2_state, entry2[1][0])
2249
2043
class TestCommitTransform(tests.TestCaseWithTransport):
2384
2178
self.assertEqual('tree', revision.properties['branch-nick'])
2387
class TestBackupName(tests.TestCase):
2389
def test_deprecations(self):
2390
class MockTransform(object):
2392
def has_named_child(self, by_parent, parent_id, name):
2393
return name in by_parent.get(parent_id, [])
2395
class MockEntry(object):
2398
object.__init__(self)
2181
class MockTransform(object):
2183
def has_named_child(self, by_parent, parent_id, name):
2184
for child_id in by_parent[parent_id]:
2188
elif name == "name.~%s~" % child_id:
2193
class MockEntry(object):
2195
object.__init__(self)
2199
class TestGetBackupName(TestCase):
2200
def test_get_backup_name(self):
2401
2201
tt = MockTransform()
2402
name1 = self.applyDeprecated(
2403
symbol_versioning.deprecated_in((2, 3, 0)),
2404
transform.get_backup_name, MockEntry(), {'a':[]}, 'a', tt)
2405
self.assertEqual('name.~1~', name1)
2406
name2 = self.applyDeprecated(
2407
symbol_versioning.deprecated_in((2, 3, 0)),
2408
transform._get_backup_name, 'name', {'a':['name.~1~']}, 'a', tt)
2409
self.assertEqual('name.~2~', name2)
2202
name = get_backup_name(MockEntry(), {'a':[]}, 'a', tt)
2203
self.assertEqual(name, 'name.~1~')
2204
name = get_backup_name(MockEntry(), {'a':['1']}, 'a', tt)
2205
self.assertEqual(name, 'name.~2~')
2206
name = get_backup_name(MockEntry(), {'a':['2']}, 'a', tt)
2207
self.assertEqual(name, 'name.~1~')
2208
name = get_backup_name(MockEntry(), {'a':['2'], 'b':[]}, 'b', tt)
2209
self.assertEqual(name, 'name.~1~')
2210
name = get_backup_name(MockEntry(), {'a':['1', '2', '3']}, 'a', tt)
2211
self.assertEqual(name, 'name.~4~')
2412
2214
class TestFileMover(tests.TestCaseWithTransport):
2415
2217
self.build_tree(['a/', 'a/b', 'c/', 'c/d'])
2416
2218
mover = _FileMover()
2417
2219
mover.rename('a', 'q')
2418
self.assertPathExists('q')
2419
self.assertPathDoesNotExist('a')
2420
self.assertPathExists('q/b')
2421
self.assertPathExists('c')
2422
self.assertPathExists('c/d')
2220
self.failUnlessExists('q')
2221
self.failIfExists('a')
2222
self.failUnlessExists('q/b')
2223
self.failUnlessExists('c')
2224
self.failUnlessExists('c/d')
2424
2226
def test_pre_delete_rollback(self):
2425
2227
self.build_tree(['a/'])
2426
2228
mover = _FileMover()
2427
2229
mover.pre_delete('a', 'q')
2428
self.assertPathExists('q')
2429
self.assertPathDoesNotExist('a')
2230
self.failUnlessExists('q')
2231
self.failIfExists('a')
2430
2232
mover.rollback()
2431
self.assertPathDoesNotExist('q')
2432
self.assertPathExists('a')
2233
self.failIfExists('q')
2234
self.failUnlessExists('a')
2434
2236
def test_apply_deletions(self):
2435
2237
self.build_tree(['a/', 'b/'])
2436
2238
mover = _FileMover()
2437
2239
mover.pre_delete('a', 'q')
2438
2240
mover.pre_delete('b', 'r')
2439
self.assertPathExists('q')
2440
self.assertPathExists('r')
2441
self.assertPathDoesNotExist('a')
2442
self.assertPathDoesNotExist('b')
2241
self.failUnlessExists('q')
2242
self.failUnlessExists('r')
2243
self.failIfExists('a')
2244
self.failIfExists('b')
2443
2245
mover.apply_deletions()
2444
self.assertPathDoesNotExist('q')
2445
self.assertPathDoesNotExist('r')
2446
self.assertPathDoesNotExist('a')
2447
self.assertPathDoesNotExist('b')
2246
self.failIfExists('q')
2247
self.failIfExists('r')
2248
self.failIfExists('a')
2249
self.failIfExists('b')
2449
2251
def test_file_mover_rollback(self):
2450
2252
self.build_tree(['a/', 'a/b', 'c/', 'c/d/', 'c/e/'])
2524
2326
tt.adjust_path('d', tt.root, tt.trans_id_tree_path('a/b'))
2525
2327
self.assertRaises(Bogus, tt.apply,
2526
2328
_mover=self.ExceptionFileMover(bad_target='d'))
2527
self.assertPathExists('a')
2528
self.assertPathExists('a/b')
2531
class TestFinalizeRobustness(tests.TestCaseWithTransport):
2532
"""Ensure treetransform creation errors can be safely cleaned up after"""
2534
def _override_globals_in_method(self, instance, method_name, globals):
2535
"""Replace method on instance with one with updated globals"""
2537
func = getattr(instance, method_name).im_func
2538
new_globals = dict(func.func_globals)
2539
new_globals.update(globals)
2540
new_func = types.FunctionType(func.func_code, new_globals,
2541
func.func_name, func.func_defaults)
2542
setattr(instance, method_name,
2543
types.MethodType(new_func, instance, instance.__class__))
2544
self.addCleanup(delattr, instance, method_name)
2547
def _fake_open_raises_before(name, mode):
2548
"""Like open() but raises before doing anything"""
2552
def _fake_open_raises_after(name, mode):
2553
"""Like open() but raises after creating file without returning"""
2554
open(name, mode).close()
2557
def create_transform_and_root_trans_id(self):
2558
"""Setup a transform creating a file in limbo"""
2559
tree = self.make_branch_and_tree('.')
2560
tt = TreeTransform(tree)
2561
return tt, tt.create_path("a", tt.root)
2563
def create_transform_and_subdir_trans_id(self):
2564
"""Setup a transform creating a directory containing a file in limbo"""
2565
tree = self.make_branch_and_tree('.')
2566
tt = TreeTransform(tree)
2567
d_trans_id = tt.create_path("d", tt.root)
2568
tt.create_directory(d_trans_id)
2569
f_trans_id = tt.create_path("a", d_trans_id)
2570
tt.adjust_path("a", d_trans_id, f_trans_id)
2571
return tt, f_trans_id
2573
def test_root_create_file_open_raises_before_creation(self):
2574
tt, trans_id = self.create_transform_and_root_trans_id()
2575
self._override_globals_in_method(tt, "create_file",
2576
{"open": self._fake_open_raises_before})
2577
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2578
path = tt._limbo_name(trans_id)
2579
self.assertPathDoesNotExist(path)
2581
self.assertPathDoesNotExist(tt._limbodir)
2583
def test_root_create_file_open_raises_after_creation(self):
2584
tt, trans_id = self.create_transform_and_root_trans_id()
2585
self._override_globals_in_method(tt, "create_file",
2586
{"open": self._fake_open_raises_after})
2587
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2588
path = tt._limbo_name(trans_id)
2589
self.assertPathExists(path)
2591
self.assertPathDoesNotExist(path)
2592
self.assertPathDoesNotExist(tt._limbodir)
2594
def test_subdir_create_file_open_raises_before_creation(self):
2595
tt, trans_id = self.create_transform_and_subdir_trans_id()
2596
self._override_globals_in_method(tt, "create_file",
2597
{"open": self._fake_open_raises_before})
2598
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2599
path = tt._limbo_name(trans_id)
2600
self.assertPathDoesNotExist(path)
2602
self.assertPathDoesNotExist(tt._limbodir)
2604
def test_subdir_create_file_open_raises_after_creation(self):
2605
tt, trans_id = self.create_transform_and_subdir_trans_id()
2606
self._override_globals_in_method(tt, "create_file",
2607
{"open": self._fake_open_raises_after})
2608
self.assertRaises(RuntimeError, tt.create_file, ["contents"], trans_id)
2609
path = tt._limbo_name(trans_id)
2610
self.assertPathExists(path)
2612
self.assertPathDoesNotExist(path)
2613
self.assertPathDoesNotExist(tt._limbodir)
2615
def test_rename_in_limbo_rename_raises_after_rename(self):
2616
tt, trans_id = self.create_transform_and_root_trans_id()
2617
parent1 = tt.new_directory('parent1', tt.root)
2618
child1 = tt.new_file('child1', parent1, 'contents')
2619
parent2 = tt.new_directory('parent2', tt.root)
2621
class FakeOSModule(object):
2622
def rename(self, old, new):
2625
self._override_globals_in_method(tt, "_rename_in_limbo",
2626
{"os": FakeOSModule()})
2628
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2629
path = osutils.pathjoin(tt._limbo_name(parent2), "child1")
2630
self.assertPathExists(path)
2632
self.assertPathDoesNotExist(path)
2633
self.assertPathDoesNotExist(tt._limbodir)
2635
def test_rename_in_limbo_rename_raises_before_rename(self):
2636
tt, trans_id = self.create_transform_and_root_trans_id()
2637
parent1 = tt.new_directory('parent1', tt.root)
2638
child1 = tt.new_file('child1', parent1, 'contents')
2639
parent2 = tt.new_directory('parent2', tt.root)
2641
class FakeOSModule(object):
2642
def rename(self, old, new):
2644
self._override_globals_in_method(tt, "_rename_in_limbo",
2645
{"os": FakeOSModule()})
2647
RuntimeError, tt.adjust_path, "child1", parent2, child1)
2648
path = osutils.pathjoin(tt._limbo_name(parent1), "child1")
2649
self.assertPathExists(path)
2651
self.assertPathDoesNotExist(path)
2652
self.assertPathDoesNotExist(tt._limbodir)
2655
class TestTransformMissingParent(tests.TestCaseWithTransport):
2657
def make_tt_with_versioned_dir(self):
2329
self.failUnlessExists('a')
2330
self.failUnlessExists('a/b')
2332
def test_resolve_no_parent(self):
2658
2333
wt = self.make_branch_and_tree('.')
2659
self.build_tree(['dir/',])
2660
wt.add(['dir'], ['dir-id'])
2661
wt.commit('Create dir')
2662
2334
tt = TreeTransform(wt)
2663
2335
self.addCleanup(tt.finalize)
2666
def test_resolve_create_parent_for_versioned_file(self):
2667
wt, tt = self.make_tt_with_versioned_dir()
2668
dir_tid = tt.trans_id_tree_file_id('dir-id')
2669
file_tid = tt.new_file('file', dir_tid, 'Contents', file_id='file-id')
2670
tt.delete_contents(dir_tid)
2671
tt.unversion_file(dir_tid)
2672
conflicts = resolve_conflicts(tt)
2673
# one conflict for the missing directory, one for the unversioned
2675
self.assertLength(2, conflicts)
2677
def test_non_versioned_file_create_conflict(self):
2678
wt, tt = self.make_tt_with_versioned_dir()
2679
dir_tid = tt.trans_id_tree_file_id('dir-id')
2680
tt.new_file('file', dir_tid, 'Contents')
2681
tt.delete_contents(dir_tid)
2682
tt.unversion_file(dir_tid)
2683
conflicts = resolve_conflicts(tt)
2684
# no conflicts or rather: orphaning 'file' resolve the 'dir' conflict
2685
self.assertLength(1, conflicts)
2686
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
2336
parent = tt.trans_id_file_id('parent-id')
2337
tt.new_file('file', parent, 'Contents')
2338
resolve_conflicts(tt)
2690
2341
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2691
2342
('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),
2692
2343
(False, False))
2693
2344
ROOT_ENTRY = ('TREE_ROOT', ('', ''), False, (True, True), (None, None),
2694
('', ''), ('directory', 'directory'), (False, False))
2345
('', ''), ('directory', 'directory'), (False, None))
2697
2348
class TestTransformPreview(tests.TestCaseWithTransport):
3597
3218
trans_id = tt.trans_id_tree_path('file')
3598
3219
self.assertEqual((LINES_ONE,),
3599
3220
tt._get_parents_texts(trans_id))
3602
class TestOrphan(tests.TestCaseWithTransport):
3604
def test_no_orphan_for_transform_preview(self):
3605
tree = self.make_branch_and_tree('tree')
3606
tt = transform.TransformPreview(tree)
3607
self.addCleanup(tt.finalize)
3608
self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3610
def _set_orphan_policy(self, wt, policy):
3611
wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
3614
def _prepare_orphan(self, wt):
3615
self.build_tree(['dir/', 'dir/file', 'dir/foo'])
3616
wt.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
3617
wt.commit('add dir and file ignoring foo')
3618
tt = transform.TreeTransform(wt)
3619
self.addCleanup(tt.finalize)
3620
# dir and bar are deleted
3621
dir_tid = tt.trans_id_tree_path('dir')
3622
file_tid = tt.trans_id_tree_path('dir/file')
3623
orphan_tid = tt.trans_id_tree_path('dir/foo')
3624
tt.delete_contents(file_tid)
3625
tt.unversion_file(file_tid)
3626
tt.delete_contents(dir_tid)
3627
tt.unversion_file(dir_tid)
3628
# There should be a conflict because dir still contain foo
3629
raw_conflicts = tt.find_conflicts()
3630
self.assertLength(1, raw_conflicts)
3631
self.assertEqual(('missing parent', 'new-1'), raw_conflicts[0])
3632
return tt, orphan_tid
3634
def test_new_orphan_created(self):
3635
wt = self.make_branch_and_tree('.')
3636
self._set_orphan_policy(wt, 'move')
3637
tt, orphan_tid = self._prepare_orphan(wt)
3640
warnings.append(args[0] % args[1:])
3641
self.overrideAttr(trace, 'warning', warning)
3642
remaining_conflicts = resolve_conflicts(tt)
3643
self.assertEquals(['dir/foo has been orphaned in bzr-orphans'],
3645
# Yeah for resolved conflicts !
3646
self.assertLength(0, remaining_conflicts)
3647
# We have a new orphan
3648
self.assertEquals('foo.~1~', tt.final_name(orphan_tid))
3649
self.assertEquals('bzr-orphans',
3650
tt.final_name(tt.final_parent(orphan_tid)))
3652
def test_never_orphan(self):
3653
wt = self.make_branch_and_tree('.')
3654
self._set_orphan_policy(wt, 'conflict')
3655
tt, orphan_tid = self._prepare_orphan(wt)
3656
remaining_conflicts = resolve_conflicts(tt)
3657
self.assertLength(1, remaining_conflicts)
3658
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3659
remaining_conflicts.pop())
3661
def test_orphan_error(self):
3662
def bogus_orphan(tt, orphan_id, parent_id):
3663
raise transform.OrphaningError(tt.final_name(orphan_id),
3664
tt.final_name(parent_id))
3665
transform.orphaning_registry.register('bogus', bogus_orphan,
3666
'Raise an error when orphaning')
3667
wt = self.make_branch_and_tree('.')
3668
self._set_orphan_policy(wt, 'bogus')
3669
tt, orphan_tid = self._prepare_orphan(wt)
3670
remaining_conflicts = resolve_conflicts(tt)
3671
self.assertLength(1, remaining_conflicts)
3672
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3673
remaining_conflicts.pop())
3675
def test_unknown_orphan_policy(self):
3676
wt = self.make_branch_and_tree('.')
3677
# Set a fictional policy nobody ever implemented
3678
self._set_orphan_policy(wt, 'donttouchmypreciouuus')
3679
tt, orphan_tid = self._prepare_orphan(wt)
3682
warnings.append(args[0] % args[1:])
3683
self.overrideAttr(trace, 'warning', warning)
3684
remaining_conflicts = resolve_conflicts(tt)
3685
# We fallback to the default policy which create a conflict
3686
self.assertLength(1, remaining_conflicts)
3687
self.assertEqual(('deleting parent', 'Not deleting', 'new-1'),
3688
remaining_conflicts.pop())
3689
self.assertLength(1, warnings)
3690
self.assertStartsWith(warnings[0], 'donttouchmypreciouuus')
added
removed
bzrlib/tests/test_transform.py
