##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

fix traceback in hgweb when URL doesn't end in one of the archive specs...
fix traceback in hgweb when URL doesn't end in one of the archive specs If the last n charecters of the URL doesn't match an entry in archive_specs req.form never has a key 'type'. When achive() looks up 'type' in the form dict it causes a traceback rather than printing an error message.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r5057:99a4592e default
r6669:782dbbdf default
Show More
test-double-merge
30 lines | 522 B | text/plain | TextLexer
/ tests / test-double-merge
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init repo
cd repo
echo line 1 > foo
hg ci -qAm 'add foo' -d "1000000 0"
# copy foo to bar and change both files
hg cp foo bar
echo line 2-1 >> foo
echo line 2-2 >> bar
hg ci -m 'cp foo bar; change both' -d "1000000 0"
# in another branch, change foo in a way that doesn't conflict with
# the other changes
hg up -qC 0
echo line 0 > foo
hg cat foo >> foo
hg ci -m 'change foo' -d "1000000 0"
# we get conflicts that shouldn't be there
hg merge --debug
echo "-- foo --"
cat foo
echo "-- bar --"
cat bar