equal
deleted
inserted
replaced
10 > chainsaw= |
10 > chainsaw= |
11 > EOF |
11 > EOF |
12 |
12 |
13 $ hg init src |
13 $ hg init src |
14 $ cd src |
14 $ cd src |
|
15 $ echo 1 > root |
|
16 $ hg add root |
|
17 $ hg ci -Am R_0 |
|
18 $ hg branch A |
|
19 marked working directory as branch A |
|
20 (branches are permanent and global, did you want a bookmark?) |
|
21 $ echo 42 > bar |
|
22 $ hg add bar |
|
23 $ hg ci -Am A_0 |
|
24 $ echo 1337 > bar |
|
25 $ hg ci -Am A_1 |
|
26 $ hg update 'desc(R_0)' |
|
27 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15 $ echo 1 > foo |
28 $ echo 1 > foo |
16 $ hg ci -Am1 |
29 $ hg add foo |
17 adding foo |
30 $ hg ci -Am B_0 |
|
31 $ hg log -G |
|
32 @ changeset: 3:bfcb8e629987 |
|
33 | tag: tip |
|
34 | parent: 0:06f48e4098b8 |
|
35 | user: test |
|
36 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
37 | summary: B_0 |
|
38 | |
|
39 | o changeset: 2:7fd8de258aa4 |
|
40 | | branch: A |
|
41 | | user: test |
|
42 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
43 | | summary: A_1 |
|
44 | | |
|
45 | o changeset: 1:ae1692b8aadb |
|
46 |/ branch: A |
|
47 | user: test |
|
48 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
49 | summary: A_0 |
|
50 | |
|
51 o changeset: 0:06f48e4098b8 |
|
52 user: test |
|
53 date: Thu Jan 01 00:00:00 1970 +0000 |
|
54 summary: R_0 |
|
55 |
18 $ cd .. |
56 $ cd .. |
19 |
57 |
20 Actual tests |
58 Actual tests |
21 ============ |
59 ============ |
22 |
60 |
28 $ hg admin::chainsaw-update --rev default --source ../src |
66 $ hg admin::chainsaw-update --rev default --source ../src |
29 recovering after interrupted transaction, if any |
67 recovering after interrupted transaction, if any |
30 no interrupted transaction available |
68 no interrupted transaction available |
31 pulling from ../src |
69 pulling from ../src |
32 updating to revision 'default' |
70 updating to revision 'default' |
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
71 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34 chainsaw-update to revision 'default' for repository at '$TESTTMP/repo' done |
72 chainsaw-update to revision 'default' for repository at '$TESTTMP/repo' done |
35 |
73 |
|
74 $ hg log -G |
|
75 @ changeset: 1:bfcb8e629987 |
|
76 | tag: tip |
|
77 | user: test |
|
78 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
79 | summary: B_0 |
|
80 | |
|
81 o changeset: 0:06f48e4098b8 |
|
82 user: test |
|
83 date: Thu Jan 01 00:00:00 1970 +0000 |
|
84 summary: R_0 |
|
85 |
|
86 $ hg status -A |
|
87 C foo |
|
88 C root |
36 $ cat foo |
89 $ cat foo |
37 1 |
90 1 |
38 |
91 |
39 Test lock breacking capabilities |
92 Test lock breacking capabilities |
40 -------------------------------- |
93 -------------------------------- |
69 $ echo untracked > bar |
122 $ echo untracked > bar |
70 $ echo modified > foo |
123 $ echo modified > foo |
71 $ hg status -A |
124 $ hg status -A |
72 M foo |
125 M foo |
73 ? bar |
126 ? bar |
|
127 C root |
74 |
128 |
75 $ echo 2 > ../src/foo |
129 $ echo 2 > ../src/foo |
76 $ hg -R ../src commit -m2 |
130 $ hg -R ../src commit -m2 |
77 $ hg admin::chainsaw-update --rev default --source ../src -q |
131 $ hg admin::chainsaw-update --rev default --source ../src -q |
78 no interrupted transaction available |
132 no interrupted transaction available |
79 $ hg status -A |
133 $ hg status -A |
80 C foo |
134 C foo |
|
135 C root |
81 $ cat foo |
136 $ cat foo |
82 2 |
137 2 |
83 |
138 |
84 Now behaviour with respect to ignored files: they are not purged if |
139 Now behaviour with respect to ignored files: they are not purged if |
85 the --no-purge-ignored flag is passed, but they are purged by default |
140 the --no-purge-ignored flag is passed, but they are purged by default |
89 $ echo ignored > bar |
144 $ echo ignored > bar |
90 $ hg status --all |
145 $ hg status --all |
91 I bar |
146 I bar |
92 C .hgignore |
147 C .hgignore |
93 C foo |
148 C foo |
|
149 C root |
94 |
150 |
95 $ hg admin::chainsaw-update --no-purge-ignored --rev default --source ../src -q |
151 $ hg admin::chainsaw-update --no-purge-ignored --rev default --source ../src -q |
96 no interrupted transaction available |
152 no interrupted transaction available |
97 $ hg status --all |
153 $ hg status --all |
98 I bar |
154 I bar |
99 C .hgignore |
155 C .hgignore |
100 C foo |
156 C foo |
|
157 C root |
101 $ cat bar |
158 $ cat bar |
102 ignored |
159 ignored |
103 |
160 |
104 $ hg admin::chainsaw-update --rev default --source ../src -q |
161 $ hg admin::chainsaw-update --rev default --source ../src -q |
105 no interrupted transaction available |
162 no interrupted transaction available |
106 $ hg status --all |
163 $ hg status --all |
107 C .hgignore |
164 C .hgignore |
108 C foo |
165 C foo |
|
166 C root |
109 $ test -f bar |
167 $ test -f bar |
110 [1] |
168 [1] |
111 |
169 |