equal
deleted
inserted
replaced
48 > [experimental] |
48 > [experimental] |
49 > topic-mode = warning |
49 > topic-mode = warning |
50 > EOF |
50 > EOF |
51 $ touch a b c d |
51 $ touch a b c d |
52 $ hg add a |
52 $ hg add a |
53 $ hg ci -m "Added a" |
53 |
|
54 (same test, checking we abort before the editor) |
|
55 |
|
56 $ HGEDITOR=cat hg ci -m "Added a" --edit |
54 warning: new draft commit without topic |
57 warning: new draft commit without topic |
55 (see 'hg help -e topic.topic-mode' for details) (no-eol) |
58 (see 'hg help -e topic.topic-mode' for details) |
56 |
59 Added a |
57 (same test, checking we abort before the editor) |
60 |
58 |
61 |
59 $ EDITOR=cat hg ci --amend -m "Added a" --edit |
62 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
60 warning: new draft commit without topic |
63 HG: Leave message empty to abort commit. |
61 (see 'hg help -e topic.topic-mode' for details) (no-eol) |
64 HG: -- |
|
65 HG: user: test |
|
66 HG: branch 'default' |
|
67 HG: added a |
|
68 |
|
69 $ HGEDITOR=cat hg ci --amend -m "Added a" --edit |
|
70 Added a |
|
71 |
|
72 |
|
73 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
74 HG: Leave message empty to abort commit. |
|
75 HG: -- |
|
76 HG: user: test |
|
77 HG: branch 'default' |
|
78 HG: added a |
62 $ hg ci --amend -m "added a'" --config experimental.topic-mode=ignore |
79 $ hg ci --amend -m "added a'" --config experimental.topic-mode=ignore |
63 $ hg log |
80 $ hg log |
64 changeset: 2:2e862d8b5eff |
81 changeset: 2:2e862d8b5eff |
65 tag: tip |
82 tag: tip |
66 parent: -1:000000000000 |
83 parent: -1:000000000000 |
101 $ hg merge mytopic |
118 $ hg merge mytopic |
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
119 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
103 (branch merge, don't forget to commit) |
120 (branch merge, don't forget to commit) |
104 $ hg commit -m "merge mytopic" |
121 $ hg commit -m "merge mytopic" |
105 warning: new draft commit without topic |
122 warning: new draft commit without topic |
106 (see 'hg help -e topic.topic-mode' for details) (no-eol) |
123 (see 'hg help -e topic.topic-mode' for details) |
107 |
124 |
108 $ hg log -G |
125 $ hg log -G |
109 @ changeset: 3:676a445d1c09 |
126 @ changeset: 3:676a445d1c09 |
110 |\ tag: tip |
127 |\ tag: tip |
111 | | parent: 2:a4da109ee59f |
128 | | parent: 2:a4da109ee59f |