Show More
@@ -1,17 +1,17 b'' | |||||
1 | #!/bin/bash |
|
1 | #!/bin/bash | |
2 |
|
2 | |||
3 | set -x |
|
3 | set -x | |
4 | hg init |
|
4 | hg init | |
5 | echo "nothing" > a |
|
5 | echo "nothing" > a | |
6 | hg add a |
|
6 | hg add a | |
7 | hg commit -t ancestor -u test -d "0 0" |
|
7 | hg commit -t ancestor -u test -d "0 0" | |
8 | echo "something" > a |
|
8 | echo "something" > a | |
9 | hg commit -t branch1 -u test -d "0 0" |
|
9 | hg commit -t branch1 -u test -d "0 0" | |
10 | hg co 0 |
|
10 | hg co 0 | |
11 | echo "something else" > a |
|
11 | echo "something else" > a | |
12 | hg commit -t branch2 -u test -d "0 0" |
|
12 | hg commit -t branch2 -u test -d "0 0" | |
13 | export HGMERGE=merge |
|
13 | export HGMERGE=merge | |
14 | hg -d up -m 1 |
|
14 | hg -d up -m 1 | |
15 | hg id |
|
15 | hg id | |
16 | cat a | grep -v ">>>" | grep -v "<<<" |
|
16 | grep -Ev ">>>|<<<" a | |
17 | hg status |
|
17 | hg status |
@@ -1,32 +1,30 b'' | |||||
1 | + hg init |
|
1 | + hg init | |
2 | + echo nothing |
|
2 | + echo nothing | |
3 | + hg add a |
|
3 | + hg add a | |
4 | + hg commit -t ancestor -u test -d '0 0' |
|
4 | + hg commit -t ancestor -u test -d '0 0' | |
5 | + echo something |
|
5 | + echo something | |
6 | + hg commit -t branch1 -u test -d '0 0' |
|
6 | + hg commit -t branch1 -u test -d '0 0' | |
7 | + hg co 0 |
|
7 | + hg co 0 | |
8 | + echo 'something else' |
|
8 | + echo 'something else' | |
9 | + hg commit -t branch2 -u test -d '0 0' |
|
9 | + hg commit -t branch2 -u test -d '0 0' | |
10 | + export HGMERGE=merge |
|
10 | + export HGMERGE=merge | |
11 | + HGMERGE=merge |
|
11 | + HGMERGE=merge | |
12 | + hg -d up -m 1 |
|
12 | + hg -d up -m 1 | |
13 | merge: warning: conflicts during merge |
|
13 | merge: warning: conflicts during merge | |
14 | resolving manifests |
|
14 | resolving manifests | |
15 | ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc |
|
15 | ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc | |
16 | a versions differ, resolve |
|
16 | a versions differ, resolve | |
17 | working dir created .out, keeping |
|
17 | working dir created .out, keeping | |
18 | merging a |
|
18 | merging a | |
19 | resolving a |
|
19 | resolving a | |
20 | file a: other d7250518cb1b ancestor 68ba9db7a9e4 |
|
20 | file a: other d7250518cb1b ancestor 68ba9db7a9e4 | |
21 | merging a failed! |
|
21 | merging a failed! | |
22 | + hg id |
|
22 | + hg id | |
23 | 32e80765d7fe+75234512624c+ tip |
|
23 | 32e80765d7fe+75234512624c+ tip | |
24 | + cat a |
|
24 | + grep -Ev '>>>|<<<' a | |
25 | + grep -v '>>>' |
|
|||
26 | + grep -v '<<<' |
|
|||
27 | something else |
|
25 | something else | |
28 | ======= |
|
26 | ======= | |
29 | something |
|
27 | something | |
30 | + hg status |
|
28 | + hg status | |
31 | C a |
|
29 | C a | |
32 | ? .out |
|
30 | ? .out |
@@ -1,24 +1,21 b'' | |||||
1 | #!/bin/bash |
|
1 | #!/bin/bash | |
2 |
|
2 | |||
3 | set -e |
|
|||
4 |
|
||||
5 | mkdir test |
|
3 | mkdir test | |
6 | cd test |
|
4 | cd test | |
7 | echo foo>foo |
|
5 | echo foo>foo | |
8 | hg init |
|
6 | hg init | |
9 | hg addremove |
|
7 | hg addremove | |
10 | hg commit -t "1" |
|
8 | hg commit -t "1" | |
11 | hg verify |
|
9 | hg verify | |
12 | hg serve -p 20059 2>/dev/null & |
|
10 | hg serve -p 20059 2>/dev/null & | |
13 | C=$! |
|
|||
14 | cd .. |
|
11 | cd .. | |
15 |
|
12 | |||
16 | mkdir copy |
|
13 | mkdir copy | |
17 | cd copy |
|
14 | cd copy | |
18 | hg init http://localhost:20059/ |
|
15 | hg init http://localhost:20059/ | |
19 | hg verify |
|
16 | hg verify | |
20 | hg co |
|
17 | hg co | |
21 | cat foo |
|
18 | cat foo | |
22 | hg manifest |
|
19 | hg manifest | |
23 |
|
20 | |||
24 |
kill |
|
21 | kill %hg |
General Comments 0
You need to be logged in to leave comments.
Login now