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

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

From Revision 1051 to 1032

Rev	Summary	Authors	Date
1051	- merge aaron's merge improvements up to - merge aaron's merge improvements up to aaron.bentley@utoronto.ca-20050805025423-c0434f52aa596d3e	Martin Pool	19 years ago
1050	todo todo	Martin Pool	19 years ago
1049	- add better handler for new_contents_conflict collision - add better handler for new_contents_conflict collision	Martin Pool	19 years ago
1048	- basic rules for hacking bzr - basic rules for hacking bzr	Martin Pool	19 years ago
1047	- add some comments on merge from talking to aaron - add some comments on merge from talking to aaron	Martin Pool	19 years ago
1046	- cleanup re-raise of exception - cleanup re-raise of exception	Martin Pool	19 years ago
1045	Doc Doc	Martin Pool	19 years ago
1044	- fix construction of NoSuchRevision - fix construction of NoSuchRevision	Martin Pool	19 years ago
1043	- fix imported name - fix imported name	Martin Pool	19 years ago
1042	- more statistics output from 'weave stats' command - more statistics output from 'weave stats' command	Martin Pool	19 years ago
1041	- todo from aaron - todo from aaron	Martin Pool	19 years ago
1040	- merge patch to take ranges to diff -r option - merge patch to take ranges to diff -r option	Martin Pool	19 years ago
1039	- don't emit warning encouraging people to run bzr upgrade, - don't emit warning encouraging people to run bzr upgrade, because that will currently break on the main branch	Martin Pool	19 years ago
1038	- don't set tree root id on newly created trees because it b... - don't set tree root id on newly created trees because it breaks some merge code and is not needed for now	Martin Pool	19 years ago
1037	- fix up imports - fix up imports	Martin Pool	19 years ago
1036	- add pending merge from aaron - add pending merge from aaron	Martin Pool	19 years ago
1035	- fix import - fix import	Martin Pool	19 years ago
1034	- merge bzrlib.revision.is_ancestor from aaron - merge bzrlib.revision.is_ancestor from aaron	Martin Pool	19 years ago
1033	todo todo	Martin Pool	19 years ago
1032	todo todo	Martin Pool	19 years ago