annotate tests/test-hg-parseurl.py.out @ 34552:33c8a6837181

merge: check for path conflicts when updating (issue5628) When updating to a new revision, check for path conflicts caused by unknown files in the working directory, and handle these by backing up the file or directory and replacing it. Differential Revision: https://phab.mercurial-scm.org/D781
author Mark Thomas <mbthomas@fb.com>
date Mon, 02 Oct 2017 14:05:30 -0700
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', [])