equal
deleted
inserted
replaced
56 user: test |
56 user: test |
57 date: Thu Jan 01 00:00:00 1970 +0000 |
57 date: Thu Jan 01 00:00:00 1970 +0000 |
58 summary: base |
58 summary: base |
59 |
59 |
60 |
60 |
|
61 Check proper abort for empty message |
|
62 |
|
63 $ cat > editor.sh << '__EOF__' |
|
64 > #!/bin/sh |
|
65 > echo "" > "$1" |
|
66 > __EOF__ |
|
67 $ echo b > b |
|
68 $ hg add b |
|
69 $ hg summary |
|
70 parent: 1:43f1ba15f28a tip |
|
71 amend base1 |
|
72 branch: default |
|
73 commit: 1 added, 1 unknown |
|
74 update: (current) |
|
75 $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend |
|
76 transaction abort! |
|
77 rollback completed |
|
78 abort: empty commit message |
|
79 [255] |
|
80 $ hg summary |
|
81 parent: 1:43f1ba15f28a tip |
|
82 amend base1 |
|
83 branch: default |
|
84 commit: 1 added, 1 unknown |
|
85 update: (current) |
|
86 |
61 Add new file: |
87 Add new file: |
62 |
88 $ hg ci --amend -m 'amend base1 new file' |
63 $ echo b > b |
|
64 $ hg ci --amend -Am 'amend base1 new file' |
|
65 adding b |
|
66 saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob) |
89 saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob) |
67 |
90 |
68 Remove file that was added in amended commit: |
91 Remove file that was added in amended commit: |
69 (and test logfile option) |
92 (and test logfile option) |
70 (and test that logfile option do not trigger an editor) |
93 (and test that logfile option do not trigger an editor) |