Mercurial: tests/test-hg-parseurl.py.out annotate

annotate tests/test-hg-parseurl.py.out @ 27005:3185c01c551c

mergestate: move _read() call to read constructor With this patch, mergestate.clean() will no longer abort when it encounters an unsupported merge type. However we hold off on testing it until backwards compatibility is in place.

author	Siddharth Agarwal <sid0@fb.com>
date	Tue, 17 Nov 2015 14:04:56 -0800
parents	375872fdadba
children

rev	line source
11322 3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 10365 diff changeset	1 http://example.com/no/anchor, branches: (None, [])
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 10365 diff changeset	2 http://example.com/an/anchor, branches: ('foo', [])
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 10365 diff changeset	3 http://example.com/no/anchor/branches, branches: (None, ['foo'])
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 10365 diff changeset	4 http://example.com/an/anchor/branches, branches: ('bar', ['foo'])
3d6915f5a2bb improve --branch processing (and differentiate from # syntax) Sune Foldager <cryo@cyanite.org> parents: 10365 diff changeset	5 http://example.com/an/anchor/branches-None, branches: ('foo', [])
13897 375872fdadba hg: make parseurl() consistently return normalised path Thomas Arendsen Hein <thomas@intevation.de> parents: 11322 diff changeset	6 http://example.com/, branches: (None, [])
375872fdadba hg: make parseurl() consistently return normalised path Thomas Arendsen Hein <thomas@intevation.de> parents: 11322 diff changeset	7 http://example.com/, branches: (None, [])
375872fdadba hg: make parseurl() consistently return normalised path Thomas Arendsen Hein <thomas@intevation.de> parents: 11322 diff changeset	8 http://example.com/, branches: ('foo', [])