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

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

clone: print "updating working directory" status message...
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
Thomas Arendsen Hein - - Load All Authors

File last commit:

r5672:8a65ea98 default
r6338:0750f111 default
Show More
test-merge-prompt
69 lines | 1.2 KiB | text/plain | TextLexer
/ tests / test-merge-prompt
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
#
# Test for b5605d88dc27
# Make ui.prompt repeat on "unrecognized response" again (issue897)
# and for 840e2b315c1f
# Fix misleading error and prompts during update/merge (issue556)
status() {
[ $? -ne 0 ] && echo "failed."
echo "status:"
hg st -A file1 file2
for file in file1 file2; do
if [ -f $file ]; then
echo "$file:"
cat $file
else
echo "$file does not exist"
fi
done
}
hg init repo
cd repo
echo 1 > file1
echo 2 > file2
hg ci -Am 'added file1 and file2' # rev 0
hg rm file1
echo changed >> file2
hg ci -m 'removed file1, changed file2' # rev 1
hg co 0
echo changed >> file1
hg rm file2
hg ci -m 'changed file1, removed file2' # rev 2
echo
echo "# non-interactive merge"
hg merge -y || echo "failed"
status
echo
echo "# interactive merge"
hg co -C
hg merge --config ui.interactive=true <<EOF || echo "failed"
c
d
EOF
status
echo
echo "# interactive merge with bad input"
hg co -C
hg merge --config ui.interactive=true <<EOF || echo "failed"
foo
bar
d
baz
c
EOF
status
echo
echo "# interactive merge with not enough input"
hg co -C
hg merge --config ui.interactive=true <<EOF || echo "failed"
d
EOF
status