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

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

Rev	Summary	Authors	Date
4597.3.13	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.12	Start writing tests for all expected conflict resolution act... Start writing tests for all expected conflict resolution actions. * bzrlib/tests/test_conflicts.py: Add shel--like tests for all conflict types. * Outline.txt: Some updates.	Vincent Ladeuil	15 years ago
4597.3.11	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.10	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.9	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.8	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.7	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.6	Merge shell-like-tests into description Merge shell-like-tests into description	Vincent Ladeuil	15 years ago
4597.3.5	Record the known related bugs. Record the known related bugs. * Outline.txt: (Related bugs): Keep track of the already known related bugs.	Vincent Ladeuil	15 years ago
4597.3.4	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	15 years ago
4597.3.3	Merge cleanup into description Merge cleanup into description	Vincent Ladeuil	15 years ago
4597.3.2	Clarify some points to address poolie's early review. Clarify some points to address poolie's early review.	Vincent Ladeuil	15 years ago
4597.3.1	First draft describing the different conflicts and some ways... First draft describing the different conflicts and some ways to resolve them.	Vincent Ladeuil	15 years ago
4597.2.1	Fix some typos. Fix some typos.	Vincent Ladeuil	15 years ago
4597	(mbp) merge back 1.18 and set version to 2.0dev (mbp) merge back 1.18 and set version to 2.0dev	Canonical.com Patch ...	15 years ago
4596	(mbp) additional fix for bzr add ignored messages (mbp) additional fix for bzr add ignored messages	Canonical.com Patch ...	15 years ago
4595	(mbp) small tweak to bundle_info tests (mbp) small tweak to bundle_info tests	Canonical.com Patch ...	15 years ago
4594	(mbp) fix 2a test failure in merge directive cherrypick test (mbp) fix 2a test failure in merge directive cherrypick test	Canonical.com Patch ...	15 years ago
4593	(robertc) Partial overhaul of check to do less duplicate wor... (robertc) Partial overhaul of check to do less duplicate work. (Robert Collins)	Canonical.com Patch ...	15 years ago
4592	Updates to buildout.cfg etc to have 'make installer-all' sta... Updates to buildout.cfg etc to have 'make installer-all' start being the preferred way to build win32 installer.	Canonical.com Patch ...	15 years ago