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

annotate tests/test-hg-parseurl.py.out @ 21552:61151f429a5f

update: introduce --tool for controlling the merge tool Update is a kind of merge and may also need a merge tool and should have the options described in the merge-tools help.

author	Mads Kiilerich <madski@unity3d.com>
date	Mon, 19 May 2014 01:53:34 +0200
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', [])