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

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

Rev	Summary	Authors	Date
4634.101.7	Start working on the ability to drop a .BASE file for --weav... Start working on the ability to drop a .BASE file for --weave and --lca merge. The main issue at this point is what to do about LCA's 'conflicted' states.	John Arbash Meinel	15 years ago
4634.101.6	killed-both and killed-base is 11 chars long. killed-both and killed-base is 11 chars long.	John Arbash Meinel	15 years ago
4634.101.5	First cut at a file for converting .plan files into .BASE fi... First cut at a file for converting .plan files into .BASE files.	John Arbash Meinel	15 years ago
4634.101.4	(andrew) Fix traceback when doing 'bzr push --use-existing-d... (andrew) Fix traceback when doing 'bzr push --use-existing-dir' into a dir with an invalid .bzr directory. (#423563)	Canonical.com Patch ...	15 years ago
4634.101.3	(igc) fix content filtering after pull, merge, switch (#3858... (igc) fix content filtering after pull, merge, switch (#385879)	Canonical.com Patch ...	15 years ago
4634.101.2	(mbp, trivial) additional doc building fix (mbp, trivial) additional doc building fix	Canonical.com Patch ...	15 years ago
4634.101.1	(mbp) cherrypick Japanese Sphinx additions to 2.0 (mbp) cherrypick Japanese Sphinx additions to 2.0	Canonical.com Patch ...	15 years ago
4634.97.3	(INADA Naoki) Import Japanese translation of documentation. (INADA Naoki) Import Japanese translation of documentation.	Canonical.com Patch ...	15 years ago
4634.97.2	(abentley) Improve handling of binary file sections in patch... (abentley) Improve handling of binary file sections in patches.	Canonical.com Patch ...	15 years ago
4634.97.1	(igc) fix for short options in shellcomplete (Benoît Pierre) (igc) fix for short options in shellcomplete (Benoît Pierre)	Canonical.com Patch ...	15 years ago
4634.94.3	(jam) Merge 2.0.2 final 2.0 series (jam) Merge 2.0.2 final 2.0 series	Canonical.com Patch ...	15 years ago
4634.94.2	(jam) Prepare the 2.0 series branch for further development. (jam) Prepare the 2.0 series branch for further development.	Canonical.com Patch ...	15 years ago
4634.94.1	(jam) Prepare 2.0.2 w/ version numbers, etc. (jam) Prepare 2.0.2 w/ version numbers, etc.	Canonical.com Patch ...	15 years ago
4634.77.14	(igc) Add Bazaar team tracker for analytics (igc) Add Bazaar team tracker for analytics	Canonical.com Patch ...	15 years ago
4634.77.13	(andrew) Fix ObjectNotLocked errors during 'bzr log'. (#4451... (andrew) Fix ObjectNotLocked errors during 'bzr log'. (#445171)	Canonical.com Patch ...	15 years ago
4634.77.12	(igc) Correctly revert content filtered files (igc) Correctly revert content filtered files	Canonical.com Patch ...	15 years ago
4634.77.11	(andrew) Cherrypick lp:bzr r4743: (igc) Fix help on formats ... (andrew) Cherrypick lp:bzr r4743: (igc) Fix help on formats now that 2a is released (Jared Hance)	Canonical.com Patch ...	15 years ago
4634.77.10	(Matt Nordhoff, (Matt Nordhoff, vila) Backport the bugfix for #461149 to allow the test suite to run without paramiko.	Canonical.com Patch ...	15 years ago
4634.77.9	(andrew) Fix 'second push failed to complete' errors when fe... (andrew) Fix 'second push failed to complete' errors when fetching from pre-2a stacked repo via HPSS. (#437626)	Canonical.com Patch ...	15 years ago
4634.77.8	(Berhard Voelker) Tweak the Makefile to avoid the gmake-ism ... (Berhard Voelker) Tweak the Makefile to avoid the gmake-ism ':='	Canonical.com Patch ...	15 years ago

Older »