Mercurial > hg

annotate tests/test-hg-parseurl.py.out @ 27048:86290f6f6599

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate._resolve: handle change/delete conflicts We will represent a deleted file as 'nullhex' in the in-memory and on-disk merge states. We need to be able to create absentfilectxes in that case, and delete the file from disk rather than try to write it out.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 20 Nov 2015 01:14:15 -0800
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', [])