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

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

hgweb: all protocol functions have become generators...
hgweb: all protocol functions have become generators Using the write() callable supplied by the start_response() call is frowned upon by the WSGI spec, returning an iterable over the content chunks is the recommended way. Be aware, though: returning many small chunks will slow down responses, because the server has to flush each chunk separately.
Alexis S. L. Carvalho - - Load All Authors

File last commit:

r6299:653ddd1d default
r6784:18c429ea default
Show More
test-merge-remove
43 lines | 586 B | text/plain | TextLexer
/ tests / test-merge-remove
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init repo
cd repo
echo foo > foo
echo bar > bar
hg ci -qAm 'add foo bar'
echo foo2 >> foo
echo bleh > bar
hg ci -m 'change foo bar'
hg up -qC 0
hg mv foo foo1
echo foo1 > foo1
hg cat foo >> foo1
hg ci -m 'mv foo foo1'
hg merge
hg debugstate --nodates
hg st -q
echo '% removing foo1 and bar'
cp foo1 F
cp bar B
hg rm -f foo1 bar
hg debugstate --nodates
hg st -qC
echo '% readding foo1 and bar'
cp F foo1
cp B bar
hg add -v foo1 bar
hg debugstate --nodates
hg st -qC
echo '% reverting foo1 and bar'
hg revert -vr . foo1 bar
hg debugstate --nodates
hg st -qC
hg diff