Mercurial > hg

comparison tests/test-merge1 @ 3988:9dcf9d45cab8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 26 Dec 2006 14:17:48 +0100
parents 49966b5ab16f
children ccfe423d3d0a
comparison
equal deleted inserted replaced
3987:c6f10448278f 3988:9dcf9d45cab8
23 echo This is file b1 > b 23 echo This is file b1 > b
24 echo %% no merges expected 24 echo %% no merges expected
25 env HGMERGE=../merge hg merge 1 25 env HGMERGE=../merge hg merge 1
26 hg diff --nodates 26 hg diff --nodates
27 hg status 27 hg status
28 cd ..; /bin/rm -rf t 28 cd ..; rm -r t
29 29
30 mkdir t 30 mkdir t
31 cd t 31 cd t
32 hg init 32 hg init
33 echo This is file a1 > a 33 echo This is file a1 > a
46 env HGMERGE=../merge hg merge 1 46 env HGMERGE=../merge hg merge 1
47 echo %% merge of b expected 47 echo %% merge of b expected
48 env HGMERGE=../merge hg merge -f 1 48 env HGMERGE=../merge hg merge -f 1
49 hg diff --nodates 49 hg diff --nodates
50 hg status 50 hg status
51 cd ..; /bin/rm -rf t 51 cd ..; rm -r t
52 echo %% 52 echo %%
53 53
54 mkdir t 54 mkdir t
55 cd t 55 cd t
56 hg init 56 hg init
75 env HGMERGE=../merge hg merge 2 75 env HGMERGE=../merge hg merge 2
76 echo %% merge expected! 76 echo %% merge expected!
77 env HGMERGE=../merge hg merge -f 2 77 env HGMERGE=../merge hg merge -f 2
78 hg diff --nodates 78 hg diff --nodates
79 hg status 79 hg status
80 cd ..; /bin/rm -rf t 80 cd ..; rm -r t
81 81
82 mkdir t 82 mkdir t
83 cd t 83 cd t
84 hg init 84 hg init
85 echo This is file a1 > a 85 echo This is file a1 > a
99 env HGMERGE=../merge hg merge 2 99 env HGMERGE=../merge hg merge 2
100 echo %% merge of b expected 100 echo %% merge of b expected
101 env HGMERGE=../merge hg merge -f 2 101 env HGMERGE=../merge hg merge -f 2
102 hg diff --nodates 102 hg diff --nodates
103 hg status 103 hg status
104 cd ..; /bin/rm -rf t