~bzr-pqm/bzr/bzr.dev : changes

~bzr-pqm/bzr/bzr.dev » Changes from revision 5409.1.21

Rev	Summary	Authors	Date
5409.1.21	Add 'bzr-orphans' to USER_DEFAULTS in bzrlib/ignores.py. Add 'bzr-orphans' to USER_DEFAULTS in bzrlib/ignores.py.	Vincent Ladeuil	14 years ago
5409.1.20	Revert to 'conflict' being the default orphaning policy and ... Revert to 'conflict' being the default orphaning policy and fix fallouts.	Vincent Ladeuil	14 years ago
5409.1.19	Move NEWS entry to 2.3b2 Move NEWS entry to 2.3b2	Vincent Ladeuil	14 years ago
5409.1.18	Merge deprecate-get-backup-name into orphan-config-option Merge deprecate-get-backup-name into orphan-config-option	Vincent Ladeuil	14 years ago
5409.1.17	Ensures we fallback to the default policy if a bogus one is ... Ensures we fallback to the default policy if a bogus one is specified.	Vincent Ladeuil	14 years ago
5409.1.16	Add ``bzrlib.transform.orphan_policy`` and allows ``never`` ... Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour. * bzrlib/transform.py: (TreeTransformBase._get_potential_orphans): Simplified. (DiskTreeTransform.new_orphan): Use the orphaning_registry. (refuse_orphan): Implement the previous behaviour (never orphan). (conflict_pass): Clarify orphan creation and fallback on error. * bzrlib/tests/test_transform.py: (TestOrphan.test_never_orphan): Add more tests to cover no orphaning and orphaning errors.	Vincent Ladeuil	14 years ago
5409.1.15	Merge deprecate-get-backup-name into orphan-config-option Merge deprecate-get-backup-name into orphan-config-option	Vincent Ladeuil	14 years ago
5409.1.14	Prepare for more ways to handle orphans. Prepare for more ways to handle orphans. * bzrlib/transform.py: (TreeTransformBase._get_potential_orphans): Factored out from conflict_pass. (new_orphan): Thunk to move_orphan. (orphaning_registry): First rough definition. (conflict_pass): Be ready for orphan handlings that don't move the orphans out of the way.	Vincent Ladeuil	14 years ago
5409.1.13	Merge orphan-non-versioned-files into deprecate-get-backup-n... Merge orphan-non-versioned-files into deprecate-get-backup-name resolving conflicts	Vincent Ladeuil	14 years ago
5409.1.12	Merge orphan-non-versioned-files into deprecate-get-backup-n... Merge orphan-non-versioned-files into deprecate-get-backup-name	Vincent Ladeuil	14 years ago
5409.1.11	Slightly cleanup bzrlib.transform and deprecate unused code. Slightly cleanup bzrlib.transform and deprecate unused code.	Vincent Ladeuil	14 years ago
5409.1.10	Merge orphan-non-versioned-files into deprecate-get-backup-n... Merge orphan-non-versioned-files into deprecate-get-backup-name	Vincent Ladeuil	14 years ago
5409.1.9	Fix renaming missed by the merge. Fix renaming missed by the merge.	Vincent Ladeuil	14 years ago
5409.1.8	Merge backup-names into orphan-non-versioned-files resolving... Merge backup-names into orphan-non-versioned-files resolving conflicts	Vincent Ladeuil	14 years ago
5409.1.7	First orphaning implementation (some tests lacking). First orphaning implementation (some tests lacking). * bzrlib/transform.py: (TreeTransformBase.new_orphan, DiskTreeTransform.new_orphan) (TransformPreview.new_orphan): Transforming a tree can create orphans, which may or not be supported. Orphaning an item moves it into a orphan dir with a regular backup name. (conflict_pass): Resolve a 'missing parent' conflict by orphaning all the unversioned files in the said parent directory. If the directory ends up not being empty the orphaning is cancelled and the conflict turned into a 'deleting parent' one instead (which is the "normal" case). * bzrlib/tests/test_transform.py: (TestSerializeTransform.test_get_parents_texts): Start adding specific tests for orphaning. * bzrlib/tests/test_bzrdir.py: (ChrootedTests.test_sprout_recursive_treeless): This test now fails, revealing a latent bug (to be filed). * bzrlib/osutils.py: (generate_backup_name): Start abstracting backup names generation. * bzrlib/bzrdir.py: (BzrDirMeta1.destroy_workingtree): Remark that we ignore the conflicts here which mask a latent bug in subtree treeless support (how's that for a confusing term ?).	Vincent Ladeuil	14 years ago
5409.1.6	Add failing tests for bug #323111. Add failing tests for bug #323111.	Vincent Ladeuil	14 years ago
5409.1.5	Merge cleanup into orphan-non-versioned-files Merge cleanup into orphan-non-versioned-files	Vincent Ladeuil	14 years ago
5409.1.4	Merge cleanup into orphan-non-versioned-files Merge cleanup into orphan-non-versioned-files	Vincent Ladeuil	14 years ago
5409.1.3	Clarify b.transform.conflict_pass. Clarify b.transform.conflict_pass. * bzrlib/transform.py: (conflict_pass): Explicitly check for the trans_id in _removed_contents so newbies don't have to guess where the KeyError is coming from.	Vincent Ladeuil	14 years ago
5409.1.2	Make make_branch_builder available to all per_workingtree te... Make make_branch_builder available to all per_workingtree tests.	Vincent Ladeuil	14 years ago

Older »