/brz/remove-bazaar

(root)/brz/remove-bazaar » Changes to breezy/tests/blackbox/test_resolve.py from revision 7532

From Revision 7532

expand all

collapse all

Rev		Summary	Authors	Date	Diff	Files
7521		Merge lp:brz/3.1. Merge lp:brz/3.1. Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690	Jelmer Vernooij	5 years ago
7175		Sprinkle some PEP8iness. Sprinkle some PEP8iness. Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611	Jelmer Vernooij	7 years ago
7170		Drop file_id argument from read functions in Tree. Drop file_id argument from read functions in Tree. Merged from https://code.launchpad.net/~jelmer/brz/no-file-ids/+merge/357984	Jelmer Vernooij	7 years ago
7052		Fix another ~500 tests on Python 3. Fix another ~500 tests on Python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-r/+merge/350430	Jelmer Vernooij	7 years ago
6928		Add more bees. In particular: Add more bees. In particular: * for file ids * for revision ids * for file contents in build_tree_contents() Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919	Jelmer Vernooij	7 years ago
6837		Merge lp:~jelmer/brz/bug842575-rm-resolve. Merge lp:~jelmer/brz/bug842575-rm-resolve.	Jelmer Vernooij	8 years ago
6819		Merge lp:~jelmer/brz/swap-arguments. Merge lp:~jelmer/brz/swap-arguments.	Jelmer Vernooij	8 years ago
6693		Drop the long deprecated 'brz get' and 'brz clone' aliases f... Drop the long deprecated 'brz get' and 'brz clone' aliases for 'brz branch'. Merged from https://code.launchpad.net/~jelmer/brz/remove-clone/+merge/325544	Jelmer Vernooij	8 years ago
6623		Merge rename to breezy. Merge rename to breezy.	Jelmer Vernooij	8 years ago
6146		(jr) Use ngettext instead of "words(s) with brackets" for pl... (jr) Use ngettext instead of "words(s) with brackets" for plurals (Jonathan  Riddell)	Patch Queue Manager	14 years ago
6143		(jr) Add gettext() to uses of note() (Jonathan Riddell) (jr) Add gettext() to uses of note() (Jonathan Riddell)	Patch Queue Manager	14 years ago
5975		(vila) Make ContentConflict resolution more robust (Vincent ... (vila) Make ContentConflict resolution more robust (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5599		(jameinel) Allow commits to stacked branches (John A Meinel) (jameinel) Allow commits to stacked branches (John A Meinel)	Canonical.com Patch ...	15 years ago
5558		(vila) Implement resolve --take-this and --take-other for te... (vila) Implement resolve --take-this and --take-other for text conflicts.  (Vincent Ladeuil)	Canonical.com Patch ...	15 years ago
5537		(vila) More feedback about the conflicts just resolved and t... (vila) More feedback about the conflicts just resolved and the remaining  ones. (Vincent Ladeuil)	Canonical.com Patch ...	15 years ago