/brz/remove-bazaar : changes

» Changes from revision 4454.3.24

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

From Revision 4454.3.4 to 4439

expand all

Rev	Summary	Authors	Date
4454.3.4	New work on how to resolve conflict lines. New work on how to resolve conflict lines. The new code doesn't try to do much resolution. All it does is claim that both parents introduced the text. The conflict resolution can be done just before displaying, rather than while building up the annotations. At least, that is the current idea.	John Arbash Meinel	16 years ago
4454.3.3	Start implementing the reannotation functionality directly. Start implementing the reannotation functionality directly.	John Arbash Meinel	16 years ago
4454.3.2	Start moving bits into helper functions. Add tests for multi... Start moving bits into helper functions. Add tests for multiple revs.	John Arbash Meinel	16 years ago
4454.3.1	Initial api for Annotator. Initial api for Annotator. Currently just a thunk around the other annotation code. But it defines the api as returning multiple possible sources for each line. And separates the annotations into a separate list from the actual lines.	John Arbash Meinel	16 years ago
4454	(mbp) resurrect BZR_PROGRESS_BAR (mbp) resurrect BZR_PROGRESS_BAR	Canonical.com Patch ...	16 years ago
4453	(vila) Add a --strict option to push (vila) Add a --strict option to push	Canonical.com Patch ...	16 years ago
4452	(andrew) Fix 'bzr init --append-revisions-only bzr+ssh://...... (andrew) Fix 'bzr init --append-revisions-only bzr+ssh://...'.	Canonical.com Patch ...	16 years ago
4451	(igc) add recursion control to list_files() API (igc) add recursion control to list_files() API	Canonical.com Patch ...	16 years ago
4450	(mbp) suppress deprecationwarning from gzip.py (mbp) suppress deprecationwarning from gzip.py	Canonical.com Patch ...	16 years ago
4449	(jam) graph.KnownGraph implementation, (jam) graph.KnownGraph implementation, used for optimized heads() lookups during annotate.	Canonical.com Patch ...	16 years ago
4448	(igc) clarify eol help topic (igc) clarify eol help topic	Canonical.com Patch ...	16 years ago
4447	(igc) better message when split fails (Neil Martinsen-Burrel... (igc) better message when split fails (Neil Martinsen-Burrell)	Canonical.com Patch ...	16 years ago
4446	(andrew) Add Repository.get_rev_id_for_revno HPSS verb (and ... (andrew) Add Repository.get_rev_id_for_revno HPSS verb (and API).	Canonical.com Patch ...	16 years ago
4445	(mbp) doc: bug handling processes (mbp) doc: bug handling processes	Canonical.com Patch ...	16 years ago
4444	(Jelmer) Move squashing of XML-invalid characters to XMLSeri... (Jelmer) Move squashing of XML-invalid characters to XMLSerializer.	Canonical.com Patch ...	16 years ago
4443	(nmb) Add docs about diverged branches and refer to it when ... (nmb) Add docs about diverged branches and refer to it when pushing fails	Canonical.com Patch ...	16 years ago
4442	(jam) Tweak chk_map.InternalNode._iter_nodes to optimize com... (jam) Tweak chk_map.InternalNode._iter_nodes to optimize common cases.	Canonical.com Patch ...	16 years ago
4441	(robertc) Make core command lookup fully hookable and extens... (robertc) Make core command lookup fully hookable and extensible. (Robert Collins)	Canonical.com Patch ...	16 years ago
4440	(mbp) doc: mention in release that we're a gnu project (mbp) doc: mention in release that we're a gnu project	Canonical.com Patch ...	16 years ago
4439	(jml) Merge 1.16rc1 back into trunk, updating NEWS and versi... (jml) Merge 1.16rc1 back into trunk, updating NEWS and version number.	Canonical.com Patch ...	16 years ago