view tests/test-merge-default @ 10453:7edc649f9f7e

progress: make determinate bar more like wget progress bar

foo [                                                          ]  0/58
foo [>                                                         ]  1/58
foo [=>                                                        ]  2/58
...
foo [=======================================================>  ] 56/58
foo [========================================================> ] 57/58
foo [=========================================================>] 58/58

The bar now has a '>' character at the end. This indicates the direction,
is consistent with the indeterminate '<=>' bar, and looks much nicer.

#!/bin/sh

hg init
echo a > a
hg commit -A -ma

echo a >> a
hg commit -mb

echo a >> a
hg commit -mc

hg up 1
echo a >> a
hg commit -md

hg up 1
echo a >> a
hg commit -me

hg up 1
echo % should fail because not at a head
hg merge

hg up
echo % should fail because \> 2 heads
hg merge

echo % should succeed
hg merge 2
hg commit -mm1

echo % should succeed - 2 heads
hg merge -P
hg merge
hg commit -mm2

echo % should fail because at tip
hg merge

hg up 0
echo % should fail because 1 head
hg merge

hg up 3
echo a >> a
hg branch foobranch
hg commit -mf
echo % should fail because merge with other branch
hg merge

true