equal
deleted
inserted
replaced
15 > EOF |
15 > EOF |
16 $ touch a b c d |
16 $ touch a b c d |
17 $ hg add a |
17 $ hg add a |
18 $ hg ci -m "Added a" |
18 $ hg ci -m "Added a" |
19 abort: no active topic |
19 abort: no active topic |
20 (set a current topic or use '--config experimental.topic-mode=off' to commit without a topic) |
20 (see 'hg help -e topic.topic-mode' for details) |
21 [255] |
21 [255] |
22 |
22 |
23 (same test, checking we abort before the editor) |
23 (same test, checking we abort before the editor) |
24 |
24 |
25 $ EDITOR=cat hg ci -m "Added a" --edit |
25 $ EDITOR=cat hg ci -m "Added a" --edit |
26 abort: no active topic |
26 abort: no active topic |
27 (set a current topic or use '--config experimental.topic-mode=off' to commit without a topic) |
27 (see 'hg help -e topic.topic-mode' for details) |
28 [255] |
28 [255] |
29 $ hg ci -m "added a" --config experimental.topic-mode=off |
29 $ hg ci -m "added a" --config experimental.topic-mode=off |
30 $ hg log |
30 $ hg log |
31 changeset: 0:a154386e50d1 |
31 changeset: 0:a154386e50d1 |
32 tag: tip |
32 tag: tip |
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 $ hg ci -m "Added a" |
54 warning: new draft commit without topic |
54 warning: new draft commit without topic |
|
55 (see 'hg help -e topic.topic-mode' for details) (no-eol) |
55 |
56 |
56 (same test, checking we abort before the editor) |
57 (same test, checking we abort before the editor) |
57 |
58 |
58 $ EDITOR=cat hg ci --amend -m "Added a" --edit |
59 $ EDITOR=cat hg ci --amend -m "Added a" --edit |
59 warning: new draft commit without topic |
60 warning: new draft commit without topic |
|
61 (see 'hg help -e topic.topic-mode' for details) (no-eol) |
60 $ hg ci --amend -m "added a'" --config experimental.topic-mode=off |
62 $ hg ci --amend -m "added a'" --config experimental.topic-mode=off |
61 $ hg log |
63 $ hg log |
62 changeset: 2:2e862d8b5eff |
64 changeset: 2:2e862d8b5eff |
63 tag: tip |
65 tag: tip |
64 parent: -1:000000000000 |
66 parent: -1:000000000000 |
99 $ hg merge mytopic |
101 $ hg merge mytopic |
100 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
101 (branch merge, don't forget to commit) |
103 (branch merge, don't forget to commit) |
102 $ hg commit -m "merge mytopic" |
104 $ hg commit -m "merge mytopic" |
103 warning: new draft commit without topic |
105 warning: new draft commit without topic |
|
106 (see 'hg help -e topic.topic-mode' for details) (no-eol) |
104 |
107 |
105 $ hg log -G |
108 $ hg log -G |
106 @ changeset: 3:676a445d1c09 |
109 @ changeset: 3:676a445d1c09 |
107 |\ tag: tip |
110 |\ tag: tip |
108 | | parent: 2:a4da109ee59f |
111 | | parent: 2:a4da109ee59f |
161 $ hg merge mytopic |
164 $ hg merge mytopic |
162 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
165 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
163 (branch merge, don't forget to commit) |
166 (branch merge, don't forget to commit) |
164 $ hg commit -m "merge mytopic" |
167 $ hg commit -m "merge mytopic" |
165 abort: no active topic |
168 abort: no active topic |
166 (set a current topic or use '--config experimental.topic-mode=off' to commit without a topic) |
169 (see 'hg help -e topic.topic-mode' for details) |
167 [255] |
170 [255] |
168 |
171 |
169 $ hg log -G |
172 $ hg log -G |
170 @ changeset: 2:a4da109ee59f |
173 @ changeset: 2:a4da109ee59f |
171 | tag: tip |
174 | tag: tip |