##// END OF EJS Templates
git: add test showing `hg commit -i` working on a git repo...
Connor Sheehan -
r46152:f9a3edf2 default
parent child Browse files
Show More
@@ -272,6 +272,87 b' This covers manifest.diff()'
272 +beta
272 +beta
273
273
274
274
275 Interactive commit should work as expected
276
277 $ echo bar >> alpha
278 $ echo bar >> beta
279 $ hg commit -m "test interactive commit" -i --config ui.interactive=true --config ui.interface=text << EOF
280 > y
281 > y
282 > n
283 > EOF
284 diff --git a/alpha b/alpha
285 1 hunks, 1 lines changed
286 examine changes to 'alpha'?
287 (enter ? for help) [Ynesfdaq?] y
288
289 @@ -1,3 +1,4 @@
290 alpha
291 a
292 a
293 +bar
294 record change 1/2 to 'alpha'?
295 (enter ? for help) [Ynesfdaq?] y
296
297 diff --git a/beta b/beta
298 1 hunks, 1 lines changed
299 examine changes to 'beta'?
300 (enter ? for help) [Ynesfdaq?] n
301
302 Status should be consistent for both systems
303
304 $ hg status
305 heads mismatch, rebuilding dagcache
306 M beta
307 $ git status
308 On branch master
309 Changes not staged for commit:
310 (use "git add <file>..." to update what will be committed)
311 (use "git checkout -- <file>..." to discard changes in working directory)
312
313 modified: beta
314
315 no changes added to commit (use "git add" and/or "git commit -a")
316
317 Contents of each commit should be the same
318
319 $ hg ex -r .
320 # HG changeset patch
321 # User test <test>
322 # Date 0 0
323 # Thu Jan 01 00:00:00 1970 +0000
324 # Node ID 80adc61cf57e99f6a412d83fee6239d1556cefcf
325 # Parent ae1ab744f95bfd5b07cf573baef98a778058537b
326 test interactive commit
327
328 diff -r ae1ab744f95b -r 80adc61cf57e alpha
329 --- a/alpha Thu Jan 01 00:00:00 1970 +0000
330 +++ b/alpha Thu Jan 01 00:00:00 1970 +0000
331 @@ -1,3 +1,4 @@
332 alpha
333 a
334 a
335 +bar
336 $ git show
337 commit 80adc61cf57e99f6a412d83fee6239d1556cefcf
338 Author: test <test>
339 Date: Thu Jan 1 00:00:00 1970 +0000
340
341 test interactive commit
342
343 diff --git a/alpha b/alpha
344 index d112a75..d2a2e9a 100644
345 --- a/alpha
346 +++ b/alpha
347 @@ -1,3 +1,4 @@
348 alpha
349 a
350 a
351 +bar
352
275 Deleting files should also work (this was issue6398)
353 Deleting files should also work (this was issue6398)
354 $ hg revert -r . --all
355 reverting beta
276 $ hg rm beta
356 $ hg rm beta
277 $ hg ci -m 'remove beta'
357 $ hg ci -m 'remove beta'
358
General Comments 0
You need to be logged in to leave comments. Login now