|
616
|
1 |
+ cat
|
|
|
2 |
+ chmod +x merge
|
|
|
3 |
+ export HGMERGE=./merge
|
|
|
4 |
+ HGMERGE=./merge
|
|
|
5 |
+ mkdir A1
|
|
|
6 |
+ cd A1
|
|
|
7 |
+ hg init
|
|
|
8 |
+ echo This is file foo1
|
|
|
9 |
+ echo This is file bar1
|
|
|
10 |
+ hg add foo bar
|
|
|
11 |
+ hg commit -t 'commit text' -d '0 0' -u user
|
|
|
12 |
+ cd ..
|
|
|
13 |
+ hg clone A1 B1
|
|
|
14 |
+ cd A1
|
|
|
15 |
+ rm bar
|
|
|
16 |
+ hg remove bar
|
|
|
17 |
+ hg commit -t 'commit test' -d '0 0' -u user
|
|
|
18 |
+ cd ../B1
|
|
|
19 |
+ echo This is file foo22
|
|
|
20 |
+ hg commit -t 'commit test' -d '0 0' -u user
|
|
|
21 |
+ cd ..
|
|
|
22 |
+ hg clone A1 A2
|
|
|
23 |
+ hg clone B1 B2
|
|
|
24 |
+ cd A1
|
|
|
25 |
+ hg pull ../B1
|
|
|
26 |
pulling from ../B1
|
|
|
27 |
searching for changes
|
|
|
28 |
adding changesets
|
|
|
29 |
adding manifests
|
|
|
30 |
adding file revisions
|
|
|
31 |
modified 1 files, added 1 changesets and 1 new revisions
|
|
|
32 |
(run 'hg update' to get a working copy)
|
|
|
33 |
+ hg update -m
|
|
|
34 |
+ hg commit -t 'commit test' -d '0 0' -u user
|
|
|
35 |
+ echo bar should remain deleted.
|
|
|
36 |
bar should remain deleted.
|
|
|
37 |
+ hg manifest
|
|
|
38 |
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
|
|
|
39 |
+ cd ../B2
|
|
|
40 |
+ hg pull ../A2
|
|
|
41 |
pulling from ../A2
|
|
|
42 |
searching for changes
|
|
|
43 |
adding changesets
|
|
|
44 |
adding manifests
|
|
|
45 |
adding file revisions
|
|
|
46 |
modified 0 files, added 1 changesets and 0 new revisions
|
|
|
47 |
(run 'hg update' to get a working copy)
|
|
|
48 |
+ hg update -m
|
|
|
49 |
+ hg commit -t 'commit test' -d '0 0' -u user
|
|
|
50 |
+ echo bar should remain deleted.
|
|
|
51 |
bar should remain deleted.
|
|
|
52 |
+ hg manifest
|
|
|
53 |
6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
|