view tests/test-merge5 @ 662:b55a78595ef6

Pass username to hgeditor, remove temporary file
# HG changeset patch
# User Radoslaw "AstralStorm" Szkodzinski <[e-mail]>
# Node ID 5c5d1484b51a53918575a199ab8985160f0ce2d7
# Parent  8c89408a7154d2da94766e957a088407fd0fef93
Pass username to hgeditor, remove temporary file

#!/bin/sh -x

mkdir t
cd t
hg init
echo This is file a1 > a
echo This is file b1 > b
hg add a b
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b22 > b
hg commit -t"comment #1" -d "0 0" -u user
hg update 0
rm b
hg commit -A -t"comment #2" -d "0 0" -u user
# in theory, we shouldn't need the "yes k" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
yes k | hg update 1
# we exit with 0 to avoid the unavoidable SIGPIPE from above causing
# us to fail this test
exit 0