##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: unify test-merge2
Pradeepkumar Gayam -
r11976:b28fc3b3 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,47 +1,53 b''
1 #!/bin/sh
2
3 mkdir t
4 cd t
5 hg init
6 echo This is file a1 > a
7 hg add a
8 hg commit -m "commit #0" -d "1000000 0"
9 echo This is file b1 > b
10 hg add b
11 hg commit -m "commit #1" -d "1000000 0"
12 rm b
13 hg update 0
14 echo This is file b2 > b
15 hg add b
16 hg commit -m "commit #2" -d "1000000 0"
17 cd ..; rm -r t
1 $ mkdir t
2 $ cd t
3 $ hg init
4 $ echo This is file a1 > a
5 $ hg add a
6 $ hg commit -m "commit #0" -d "1000000 0"
7 $ echo This is file b1 > b
8 $ hg add b
9 $ hg commit -m "commit #1" -d "1000000 0"
10 $ rm b
11 $ hg update 0
12 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
13 $ echo This is file b2 > b
14 $ hg add b
15 $ hg commit -m "commit #2" -d "1000000 0"
16 created new head
17 $ cd ..; rm -r t
18 18
19 mkdir t
20 cd t
21 hg init
22 echo This is file a1 > a
23 hg add a
24 hg commit -m "commit #0" -d "1000000 0"
25 echo This is file b1 > b
26 hg add b
27 hg commit -m "commit #1" -d "1000000 0"
28 rm b
29 hg update 0
30 echo This is file b2 > b
31 hg commit -A -m "commit #2" -d "1000000 0"
32 cd ..; rm -r t
19 $ mkdir t
20 $ cd t
21 $ hg init
22 $ echo This is file a1 > a
23 $ hg add a
24 $ hg commit -m "commit #0" -d "1000000 0"
25 $ echo This is file b1 > b
26 $ hg add b
27 $ hg commit -m "commit #1" -d "1000000 0"
28 $ rm b
29 $ hg update 0
30 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
31 $ echo This is file b2 > b
32 $ hg commit -A -m "commit #2" -d "1000000 0"
33 adding b
34 created new head
35 $ cd ..; rm -r t
33 36
34 mkdir t
35 cd t
36 hg init
37 echo This is file a1 > a
38 hg add a
39 hg commit -m "commit #0" -d "1000000 0"
40 echo This is file b1 > b
41 hg add b
42 hg commit -m "commit #1" -d "1000000 0"
43 rm b
44 hg remove b
45 hg update 0
46 echo This is file b2 > b
47 hg commit -A -m "commit #2" -d "1000000 0"
37 $ mkdir t
38 $ cd t
39 $ hg init
40 $ echo This is file a1 > a
41 $ hg add a
42 $ hg commit -m "commit #0" -d "1000000 0"
43 $ echo This is file b1 > b
44 $ hg add b
45 $ hg commit -m "commit #1" -d "1000000 0"
46 $ rm b
47 $ hg remove b
48 $ hg update 0
49 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
50 $ echo This is file b2 > b
51 $ hg commit -A -m "commit #2" -d "1000000 0"
52 adding b
53 created new head
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now