Mercurial > hg
comparison tests/test-revert-interactive.t @ 30532:66b162fa3ffa
revert: prompt before removing files in interactive mode
Prior to this change, files to be removed (i.e. files added since the revision
to revert to) were unconditionally removed despite the interactive mode. Now
prompt before actually removing the files, as this is done for other actions
(e.g. forget).
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Fri, 25 Nov 2016 09:10:30 +0100 |
| parents | 841092fd6b85 |
| children | 3af9a9628ecf |
comparison
equal
deleted
inserted
replaced
| 30531:841092fd6b85 | 30532:66b162fa3ffa |
|---|---|
| 44 > y | 44 > y |
| 45 > y | 45 > y |
| 46 > y | 46 > y |
| 47 > y | 47 > y |
| 48 > y | 48 > y |
| 49 > y | |
| 49 > n | 50 > n |
| 50 > n | 51 > n |
| 51 > EOF | 52 > EOF |
| 52 reverting f | 53 reverting f |
| 53 reverting folder1/g (glob) | 54 reverting folder1/g (glob) |
| 54 removing folder1/i (glob) | 55 removing folder1/i (glob) |
| 55 reverting folder2/h (glob) | 56 reverting folder2/h (glob) |
| 57 remove added file folder1/i (Yn)? y | |
| 56 diff --git a/f b/f | 58 diff --git a/f b/f |
| 57 2 hunks, 2 lines changed | 59 2 hunks, 2 lines changed |
| 58 examine changes to 'f'? [Ynesfdaq?] y | 60 examine changes to 'f'? [Ynesfdaq?] y |
| 59 | 61 |
| 60 @@ -1,5 +1,6 @@ | 62 @@ -1,5 +1,6 @@ |
| 172 | 174 |
| 173 | 175 |
| 174 $ hg update -C 6 | 176 $ hg update -C 6 |
| 175 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 177 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 176 $ hg revert -i -r 2 --all -- << EOF | 178 $ hg revert -i -r 2 --all -- << EOF |
| 179 > n | |
| 177 > y | 180 > y |
| 178 > y | 181 > y |
| 179 > y | 182 > y |
| 180 > y | 183 > y |
| 181 > y | 184 > y |
| 184 > EOF | 187 > EOF |
| 185 reverting f | 188 reverting f |
| 186 reverting folder1/g (glob) | 189 reverting folder1/g (glob) |
| 187 removing folder1/i (glob) | 190 removing folder1/i (glob) |
| 188 reverting folder2/h (glob) | 191 reverting folder2/h (glob) |
| 192 remove added file folder1/i (Yn)? n | |
| 189 diff --git a/f b/f | 193 diff --git a/f b/f |
| 190 2 hunks, 2 lines changed | 194 2 hunks, 2 lines changed |
| 191 examine changes to 'f'? [Ynesfdaq?] y | 195 examine changes to 'f'? [Ynesfdaq?] y |
| 192 | 196 |
| 193 @@ -1,5 +1,6 @@ | 197 @@ -1,5 +1,6 @@ |
| 256 5 | 260 5 |
| 257 f | 261 f |
| 258 $ hg st | 262 $ hg st |
| 259 M f | 263 M f |
| 260 M folder1/g | 264 M folder1/g |
| 261 R folder1/i | |
| 262 $ hg revert --interactive f << EOF | 265 $ hg revert --interactive f << EOF |
| 263 > y | 266 > y |
| 264 > y | 267 > y |
| 265 > n | 268 > n |
| 266 > n | 269 > n |
| 288 discard change 2/2 to 'f'? [Ynesfdaq?] n | 291 discard change 2/2 to 'f'? [Ynesfdaq?] n |
| 289 | 292 |
| 290 $ hg st | 293 $ hg st |
| 291 M f | 294 M f |
| 292 M folder1/g | 295 M folder1/g |
| 293 R folder1/i | |
| 294 ? f.orig | 296 ? f.orig |
| 295 $ cat f | 297 $ cat f |
| 296 a | 298 a |
| 297 1 | 299 1 |
| 298 2 | 300 2 |
| 305 3 | 307 3 |
| 306 4 | 308 4 |
| 307 5 | 309 5 |
| 308 $ rm f.orig | 310 $ rm f.orig |
| 309 $ hg update -C . | 311 $ hg update -C . |
| 310 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 312 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 311 | 313 |
| 312 Check editing files newly added by a revert | 314 Check editing files newly added by a revert |
| 313 | 315 |
| 314 1) Create a dummy editor changing 1 to 42 | 316 1) Create a dummy editor changing 1 to 42 |
| 315 $ cat > $TESTTMP/editor.sh << '__EOF__' | 317 $ cat > $TESTTMP/editor.sh << '__EOF__' |