equal
deleted
inserted
replaced
|
1 #testcases abortcommand abortflag |
|
2 |
|
3 #if abortflag |
|
4 $ cat >> $HGRCPATH <<EOF |
|
5 > [alias] |
|
6 > abort = histedit --abort |
|
7 > EOF |
|
8 #endif |
|
9 |
1 $ . "$TESTDIR/histedit-helpers.sh" |
10 $ . "$TESTDIR/histedit-helpers.sh" |
2 |
11 |
3 Enable extension used by this test |
12 Enable extension used by this test |
4 $ cat >>$HGRCPATH <<EOF |
13 $ cat >>$HGRCPATH <<EOF |
5 > [extensions] |
14 > [extensions] |
42 > EOF |
51 > EOF |
43 merging file |
52 merging file |
44 Editing (7d5187087c79), you may commit or record as needed now. |
53 Editing (7d5187087c79), you may commit or record as needed now. |
45 (hg histedit --continue to resume) |
54 (hg histedit --continue to resume) |
46 [1] |
55 [1] |
47 $ hg histedit --abort |
56 $ hg abort |
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg |
58 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg |
50 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg |
59 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg |
51 |
60 |
52 Test when `backup-bundle` config option is not enabled |
61 Test when `backup-bundle` config option is not enabled |
64 > EOF |
73 > EOF |
65 merging file |
74 merging file |
66 Editing (7d5187087c79), you may commit or record as needed now. |
75 Editing (7d5187087c79), you may commit or record as needed now. |
67 (hg histedit --continue to resume) |
76 (hg histedit --continue to resume) |
68 [1] |
77 [1] |
69 $ hg histedit --abort |
78 |
|
79 $ hg abort |
70 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |