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

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

Rev	Summary	Authors	Date
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
5409.1.1	Cleanup imports (most of them were useless). Cleanup imports (most of them were useless).	Vincent Ladeuil	14 years ago
5409	(jameinel) Restore TestSuite and TestLoader as attributes of... (jameinel) Restore TestSuite and TestLoader as attributes of bzrlib.tests (John A Meinel)	Canonical.com Patch ...	14 years ago
5408	(jameinel) Use StringIO rather than real files on disk for l... (jameinel) Use StringIO rather than real files on disk for log files in tests. (Andrew Bennetts)	Canonical.com Patch ...	14 years ago
5407	(jameinel) Remove monkey patching for elementtree, (jameinel) Remove monkey patching for elementtree, we do it differently anyway (Martin [gz])	Canonical.com Patch ...	14 years ago
5406	(jameinel) Check os.name for 'posix' to enable os.kill, (jameinel) Check os.name for 'posix' to enable os.kill, since kill exists on win32 in python2.7 (Martin [gz])	Canonical.com Patch ...	14 years ago
5405	(jameinel) Fix bug #626876 by properly waiting for the param... (jameinel) Fix bug #626876 by properly waiting for the paramiko.Transport thread to finish its work. (John A Meinel)	Canonical.com Patch ...	14 years ago
5404	(vila) Cleanups in bzrlib.transform.py (Vincent Ladeuil) (vila) Cleanups in bzrlib.transform.py (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5403	(jelmer) Add development8-subtree development format which c... (jelmer) Add development8-subtree development format which combines nested tree support and CHK repositories. (Jelmer Vernooij)	Canonical.com Patch ...	14 years ago

Older »