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

~bzr-pqm/bzr/bzr.dev » Changes to bzrlib/conflicts.py from revision 6622

From Revision 6622 to 5284

Rev	Summary	Authors	Date
6439	(vila) Merge 2.5 into trunk (Vincent Ladeuil) (vila) Merge 2.5 into trunk (Vincent Ladeuil)	Patch Queue Manager	12 years ago
6386	(jelmer) Use the absolute_import feature everywhere in bzrli... (jelmer) Use the absolute_import feature everywhere in bzrlib, and add a source test to make sure it's used everywhere. (Jelmer Vernooij)	Patch Queue Manager	12 years ago
6304	(gz) Include registry option value switches in help style ch... (gz) Include registry option value switches in help style checking test (Martin Packman)	Patch Queue Manager	13 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	13 years ago
6144	(jr) Add gettext() to user error messages (jr) Add gettext() to user error messages (Jonathan Riddell)	Patch Queue Manager	13 years ago
6143	(jr) Add gettext() to uses of note() (Jonathan Riddell) (jr) Add gettext() to uses of note() (Jonathan Riddell)	Patch Queue Manager	13 years ago
5995	(vila) Do not generate path conflicts if a corresponding con... (vila) Do not generate path conflicts if a corresponding content conflict exists. (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago
5975	(vila) Make ContentConflict resolution more robust (Vincent ... (vila) Make ContentConflict resolution more robust (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago
5923	(vila) Fix some imports and other pyflakes failures. (Martin... (vila) Fix some imports and other pyflakes failures. (Martin Pool)	Canonical.com Patch ...	13 years ago
5907	(gz) Fix unicode handling in bzrlib.conflicts ui code (Marti... (gz) Fix unicode handling in bzrlib.conflicts ui code (Martin [gz])	Canonical.com Patch ...	13 years ago
5652	(vila) Merge 2.3 into trunk including fixes for bug #715058 ... (vila) Merge 2.3 into trunk including fixes for bug #715058 and bug #713258 (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago
5632	(vila) Added external merge tool management module, (vila) Added external merge tool management module, bzrlib.mergetools. (Gordon Tyler)	Canonical.com Patch ...	13 years ago
5615	(vila) Merge 2.3 into trunk including fix for bug #660935 (V... (vila) Merge 2.3 into trunk including fix for bug #660935 (Vincent Ladeuil)	Canonical.com Patch ...	13 years ago
5599	(jameinel) Allow commits to stacked branches (John A Meinel) (jameinel) Allow commits to stacked branches (John A Meinel)	Canonical.com Patch ...	13 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 ...	13 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 ...	14 years ago
5531	(vila) Merge 2.2 into trunk including fix for bug #646961 (V... (vila) Merge 2.2 into trunk including fix for bug #646961 (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5523	(vila) Respect --directory when path parameters are also use... (vila) Respect --directory when path parameters are also used for shelve and restore (Vincent Ladeuil)	Canonical.com Patch ...	14 years ago
5351	(mbp) tree_files and internal_tree files moved to WorkingTre... (mbp) tree_files and internal_tree files moved to WorkingTree (Martin Pool)	Canonical.com Patch ...	14 years ago
5284	(spiv) Add --directory option to 8 more commands. (Martin vo... (spiv) Add --directory option to 8 more commands. (Martin von Gagern)	Canonical.com Patch ...	14 years ago

Older »