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

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

From Revision 3249.3.1 to 3231

Rev	Summary	Authors	Date
3249.3.1	Implement cherrypick support for Merge3 Implement cherrypick support for Merge3 When merging a cherrypick, use a slightly different resolve logic. When encountering a conflict, the new logic does not include lines that were present in BASE that are conflicting with OTHER. This is done since a cherrypick is (by definition) avoiding changes that are present in the base. (related to bug #151731)	John Arbash Meinel	16 years ago
3249	(bialix) Allow rename (change case of name) directory on cas... (bialix) Allow rename (change case of name) directory on case-insensitive filesystem.	Canonical.com Patch ...	16 years ago
3248	(James Westby) Make -Dpack not raise an error for unknown va... (James Westby) Make -Dpack not raise an error for unknown variable	Canonical.com Patch ...	16 years ago
3247	Use correct index in LCA merge (abentley, #196780) Use correct index in LCA merge (abentley, #196780)	Canonical.com Patch ...	16 years ago
3246	(James Westby) Make version-info --custom imply --all. (#195... (James Westby) Make version-info --custom imply --all. (#195560)	Canonical.com Patch ...	16 years ago
3245	(Wesley J. Landaker) Add some more text to the --rio option ... (Wesley J. Landaker) Add some more text to the --rio option help in version-info.	Canonical.com Patch ...	16 years ago
3244	(Michael Hudson) clean up option.py and branch.py imports (Michael Hudson) clean up option.py and branch.py imports	Canonical.com Patch ...	16 years ago
3243	Fix branch implementation tests for rich-root repository usi... Fix branch implementation tests for rich-root repository using branches (Robert Collins)	Canonical.com Patch ...	16 years ago
3242	Remove cruft left in RemoteRepository - supports_external_lo... Remove cruft left in RemoteRepository - supports_external_lookips is a format attribute. (Robert Collins)	Canonical.com Patch ...	16 years ago
3241	Implement checkout entirely via dirstate (abentley) Implement checkout entirely via dirstate (abentley)	Canonical.com Patch ...	16 years ago
3240	(jam) wrap bazaar_workflows.txt to 79 chars (jam) wrap bazaar_workflows.txt to 79 chars	Canonical.com Patch ...	16 years ago
3239	Convert hasattr to getatter in ConfigObj (mnordhoff) Convert hasattr to getatter in ConfigObj (mnordhoff)	Canonical.com Patch ...	16 years ago
3238	(Neil Martinsen-Burrell) doc cleanups (Neil Martinsen-Burrell) doc cleanups	Canonical.com Patch ...	16 years ago
3237	Update bundled ConfigObj to 4.5.1 (mnordhoff) Update bundled ConfigObj to 4.5.1 (mnordhoff)	Canonical.com Patch ...	16 years ago
3236	Merge 1.2 branch Merge 1.2 branch	Canonical.com Patch ...	16 years ago
3235	Add hardlink support to checkout and branch (abentley) Add hardlink support to checkout and branch (abentley)	Canonical.com Patch ...	16 years ago
3234	(James Henstridge) Fix MemoryTransport._abspath() for relpat... (James Henstridge) Fix MemoryTransport._abspath() for relpath='' (bug #188855)	Canonical.com Patch ...	16 years ago
3233	(Adeodato Simo) bzr-svn does not use pack-0.92-subtree (Adeodato Simo) bzr-svn does not use pack-0.92-subtree	Canonical.com Patch ...	16 years ago
3232	(Dmitry Vasiliev) Restore auto-detection of plink.exe on Win... (Dmitry Vasiliev) Restore auto-detection of plink.exe on Windows (bug #107593)	Canonical.com Patch ...	16 years ago
3231	(bialix) bzr.exe: move builtin plugins out of library.zip (bialix) bzr.exe: move builtin plugins out of library.zip	Canonical.com Patch ...	16 years ago

Older »