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

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

record: check that we are not committing a merge before patch selection...
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.
Matt Mackall - - Load All Authors

File last commit:

r3736:ad3d5b43 default
r11237:feb2a58f stable
Show More
test-simple-update
24 lines | 245 B | text/plain | TextLexer
/ tests / test-simple-update
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
set -e
mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m "1"
hg verify
hg clone . ../branch
cd ../branch
hg co
echo bar>>foo
hg commit -m "2"
cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest --debug