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

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

From Revision 1647 to 1628

Rev	Summary	Authors	Date
1647	New conflict-handling system New conflict-handling system	Canonical.com Patch ...	18 years ago
1646	Reduced spurious conflicts Reduced spurious conflicts	Canonical.com Patch ...	18 years ago
1645	Fix note implementation Fix note implementation	Canonical.com Patch ...	18 years ago
1644	progress indicator for build_tree progress indicator for build_tree	Canonical.com Patch ...	18 years ago
1643	(mbp) better log help message (mbp) better log help message	Canonical.com Patch ...	18 years ago
1642	Merge knit performance improvements. Merge knit performance improvements.	Canonical.com Patch ...	18 years ago
1641	Pass note up the stack instead of using bzrlib.ui_factory Pass note up the stack instead of using bzrlib.ui_factory	Canonical.com Patch ...	18 years ago
1640	Change the basis-inventory file to not have the revision-id ... Change the basis-inventory file to not have the revision-id in the file name.	Canonical.com Patch ...	18 years ago
1639	Update HACKING to reflect current test writing policy. Update HACKING to reflect current test writing policy.	Canonical.com Patch ...	18 years ago
1638	Fix calling relpath() and abspath() on transports at their r... Fix calling relpath() and abspath() on transports at their root.	Canonical.com Patch ...	18 years ago
1637	Shorten test dir names, to avoid path-length problems Shorten test dir names, to avoid path-length problems	Canonical.com Patch ...	18 years ago
1636	Merge Erik Bagfors --trees option for init-repository. Merge Erik Bagfors --trees option for init-repository.	Canonical.com Patch ...	18 years ago
1635	Merge NFS LockDir support (Aaron Bentley, Robert Collins). Merge NFS LockDir support (Aaron Bentley, Robert Collins).	Canonical.com Patch ...	18 years ago
1634	Fixed pb.note interaction with nested progress bars Fixed pb.note interaction with nested progress bars	Canonical.com Patch ...	18 years ago
1633	Test using bzr checkout to reconstitute working trees. Test using bzr checkout to reconstitute working trees.	Canonical.com Patch ...	18 years ago
1632	Various fixes for win32 Various fixes for win32	Canonical.com Patch ...	18 years ago
1631	Fix uncommit to handle bound branches, and to do locking Fix uncommit to handle bound branches, and to do locking	Canonical.com Patch ...	18 years ago
1630	Fixed typo (Olaf Conradi) Fixed typo (Olaf Conradi)	Canonical.com Patch ...	18 years ago
1629	Fixed garbage in progress/warning interactions Fixed garbage in progress/warning interactions	Canonical.com Patch ...	18 years ago
1628	Merge in merge_sort facility. Merge in merge_sort facility.	Canonical.com Patch ...	18 years ago