|
331
|
1 |
#!/bin/bash
|
|
|
2 |
|
|
|
3 |
export HGMERGE=true
|
|
|
4 |
|
|
|
5 |
set -ex
|
|
|
6 |
mkdir r1
|
|
|
7 |
cd r1
|
|
|
8 |
hg init
|
|
|
9 |
echo a > a
|
|
|
10 |
hg addremove
|
|
|
11 |
hg commit -t "1" -u test -d "0 0"
|
|
|
12 |
|
|
|
13 |
cd ..
|
|
|
14 |
mkdir r2
|
|
|
15 |
cd r2
|
|
|
16 |
hg init ../r1
|
|
|
17 |
hg up
|
|
|
18 |
echo abc > a
|
|
332
|
19 |
hg diff > ../d
|
|
|
20 |
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
|
|
331
|
21 |
|
|
|
22 |
cd ../r1
|
|
|
23 |
echo b > b
|
|
|
24 |
echo a2 > a
|
|
|
25 |
hg addremove
|
|
|
26 |
hg commit -t "2" -u test -d "0 0"
|
|
|
27 |
|
|
|
28 |
cd ../r2
|
|
|
29 |
hg -q pull ../r1
|
|
|
30 |
hg status
|
|
|
31 |
hg -d up
|
|
|
32 |
hg -d up -m
|
|
|
33 |
hg parents
|
|
|
34 |
hg -v history
|
|
332
|
35 |
hg diff > ../d
|
|
|
36 |
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
|
|
331
|
37 |
|