equal
deleted
inserted
replaced
158 $ revtest '-c dirty linear' dirty 1 2 -c |
158 $ revtest '-c dirty linear' dirty 1 2 -c |
159 abort: uncommitted changes |
159 abort: uncommitted changes |
160 parent=1 |
160 parent=1 |
161 M foo |
161 M foo |
162 |
162 |
|
163 $ revtest '-m dirty linear' dirty 1 2 -m |
|
164 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
165 parent=2 |
|
166 M foo |
|
167 |
|
168 $ revtest '-m dirty cross' dirty 3 4 -m |
|
169 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
170 parent=4 |
|
171 M foo |
|
172 |
163 $ revtest '-c dirtysub linear' dirtysub 1 2 -c |
173 $ revtest '-c dirtysub linear' dirtysub 1 2 -c |
164 abort: uncommitted changes in subrepository 'sub' |
174 abort: uncommitted changes in subrepository 'sub' |
165 parent=1 |
175 parent=1 |
166 M sub/suba |
176 M sub/suba |
167 |
177 |
169 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
179 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
170 1 other heads for branch "default" |
180 1 other heads for branch "default" |
171 parent=2 |
181 parent=2 |
172 |
182 |
173 $ revtest '-cC dirty linear' dirty 1 2 -cC |
183 $ revtest '-cC dirty linear' dirty 1 2 -cC |
174 abort: cannot specify both -c/--check and -C/--clean |
184 abort: can only specify one of -C/--clean, -c/--check, or -m/merge |
|
185 parent=1 |
|
186 M foo |
|
187 |
|
188 $ revtest '-mc dirty linear' dirty 1 2 -mc |
|
189 abort: can only specify one of -C/--clean, -c/--check, or -m/merge |
|
190 parent=1 |
|
191 M foo |
|
192 |
|
193 $ revtest '-mC dirty linear' dirty 1 2 -mC |
|
194 abort: can only specify one of -C/--clean, -c/--check, or -m/merge |
175 parent=1 |
195 parent=1 |
176 M foo |
196 M foo |
177 |
197 |
178 $ cd .. |
198 $ cd .. |
179 |
199 |