annotate tests/test-hg-parseurl.py.out @ 26352:e635bc9bb7d9

resolve: consistently describe re-merge + unresolved
author timeless@mozdev.org
date Fri, 25 Sep 2015 03:51:46 -0400
parents 375872fdadba
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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', [])