/brz/remove-bazaar : changes

» Changes to breezy/merge3.py from revision 7532

To get this branch, use:

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

From Revision 7532 to 2080

expand all

Rev	Summary	Authors	Date
7493	Drop unnecessary imports from __future__. Drop unnecessary imports from __future__. Merged from https://code.launchpad.net/~jelmer/brz/drop-future/+merge/379372	Jelmer Vernooĳ	5 years ago
7303	Use external patiencediff. Use external patiencediff. Merged from https://code.launchpad.net/~jelmer/brz/external-patiencediff/+merge/363891	Jelmer Vernooĳ	6 years ago
7261	Add .base_url property to Hoster. Add .base_url property to Hoster. Merged from https://code.launchpad.net/~jelmer/brz/propose-base-url/+merge/362565	Jelmer Vernooĳ	6 years ago
7175	Sprinkle some PEP8iness. Sprinkle some PEP8iness. Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611	Jelmer Vernooĳ	7 years ago
7036	Fix some merge tests on Python 3. Fix some merge tests on Python 3. Merged from https://code.launchpad.net/~jelmer/brz/python3-merge/+merge/349097	Jelmer Vernooĳ	7 years ago
7003	Fix more tests. Fix more tests. Merged from https://code.launchpad.net/~jelmer/brz/python3-g/+merge/348134	Jelmer Vernooĳ	7 years ago
6993	Merge lp:~jelmer/brz/python3-d Merge lp:~jelmer/brz/python3-d	Jelmer Vernooĳ	7 years ago
6653	Apply 2to3 xrange fixer Apply 2to3 xrange fixer Merged from https://code.launchpad.net/~gz/brz/xrangeless/+merge/325046	Martin	8 years ago
6624	Merge Python3 porting work ('py3 pokes') Merge Python3 porting work ('py3 pokes')	Jelmer Vernooĳ	8 years ago
6623	Merge rename to breezy. Merge rename to breezy.	Jelmer Vernooĳ	8 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	13 years ago
5404	(vila) Cleanups in bzrlib.transform.py (Vincent Ladeuil) (vila) Cleanups in bzrlib.transform.py (Vincent Ladeuil)	Canonical.com Patch ...	15 years ago
5185	(vila) Various test cleanups and copyright updates (vila) Various test cleanups and copyright updates	Canonical.com Patch ...	15 years ago
5181	(vila) Extend Merge3 API to also work with objects rather th... (vila) Extend Merge3 API to also work with objects rather than text lines. (Andrew Bennetts)	Canonical.com Patch ...	15 years ago
4193	(mbp) merge update to FSF address (mbp) merge update to FSF address	Canonical.com Patch ...	16 years ago
4033	(Marius Kruger) Remove all trailing whitespace and add tests... (Marius Kruger) Remove all trailing whitespace and add tests to enforce this.	Canonical.com Patch ...	16 years ago
3415	(mbp) remove and disallow assert statements (mbp) remove and disallow assert statements	Canonical.com Patch ...	17 years ago
3279	(jam) Implement Cherrypick support for Merge3 (jam) Implement Cherrypick support for Merge3	Canonical.com Patch ...	17 years ago
2353	Merge autodetects line ending for conflict markers Merge autodetects line ending for conflict markers	Canonical.com Patch ...	18 years ago
2080	(John Arbash Meinel) Cleanup copyright and license statement... (John Arbash Meinel) Cleanup copyright and license statements	Canonical.com Patch ...	19 years ago

Older »