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

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

From Revision 974.1.16 to 971

Rev	Summary	Authors	Date
974.1.16	Ensured that revert FILE only modifies that file. Ensured that revert FILE only modifies that file.	Aaron Bentley	19 years ago
974.1.15	Removed use of patch and diff in merge, removed patch.diff Removed use of patch and diff in merge, removed patch.diff	aaron.bentley at uto...	19 years ago
974.1.14	Fixed bugs in merge optimization Fixed bugs in merge optimization	aaron.bentley at uto...	19 years ago
974.1.13	Avoid rewriting inventory when not necessary Avoid rewriting inventory when not necessary	aaron.bentley at uto...	19 years ago
974.1.12	Switched from text-id to hashcache for merge optimization Switched from text-id to hashcache for merge optimization	aaron.bentley at uto...	19 years ago
974.1.11	replaced revert with merge-revert replaced revert with merge-revert	aaron.bentley at uto...	19 years ago
974.1.10	Added file-selection to merge-revert Added file-selection to merge-revert	aaron.bentley at uto...	19 years ago
974.1.9	Added merge-type parameter to merge. Added merge-type parameter to merge.	Aaron Bentley	19 years ago
974.1.8	Added default backups for merge-revert Added default backups for merge-revert	Aaron Bentley	19 years ago
974.1.7	Fixed handling of merge factory in test suite Fixed handling of merge factory in test suite	Aaron Bentley	19 years ago
974.1.6	Added unit tests Added unit tests	Aaron Bentley	19 years ago
974.1.5	Fixed handling of missing newlines in udiffs Fixed handling of missing newlines in udiffs	Aaron Bentley	19 years ago
974.1.4	Implemented merge3 as the default text merge Implemented merge3 as the default text merge	Aaron Bentley	19 years ago
974.1.3	Added merge_factory parameter to merge_flex Added merge_factory parameter to merge_flex	Aaron Bentley	19 years ago
974.1.2	Replaced popen with subprocess in patch..py Replaced popen with subprocess in patch..py	Aaron Bentley	19 years ago
974.1.1	Fixed python invocation Fixed python invocation	Aaron Bentley	19 years ago
974	- start adding tests for commit in subdir - start adding tests for commit in subdir - change _parse_master_args to not strip off argv[0] so that it's easier to call these from white-box tests	Martin Pool	19 years ago
973	- various refactorings of command interpreter - various refactorings of command interpreter	Martin Pool	19 years ago
972	- less dodgy is_inside function - less dodgy is_inside function	Martin Pool	19 years ago
971	- update news - update news	Martin Pool	19 years ago

Older »