equal
deleted
inserted
replaced
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 (see 'hg help -e topic.topic-mode' for details) |
56 |
56 |
57 (same test, checking we abort before the editor) |
57 (same test, checking we abort before the editor) |
58 |
58 |
59 $ EDITOR=cat hg ci --amend -m "Added a" --edit |
59 $ EDITOR=cat hg ci --amend -m "Added a" --edit |
60 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) |
61 (see 'hg help -e topic.topic-mode' for details) |
62 $ hg ci --amend -m "added a'" --config experimental.topic-mode=ignore |
62 $ hg ci --amend -m "added a'" --config experimental.topic-mode=ignore |
63 $ hg log |
63 $ hg log |
64 changeset: 2:2e862d8b5eff |
64 changeset: 2:2e862d8b5eff |
65 tag: tip |
65 tag: tip |
66 parent: -1:000000000000 |
66 parent: -1:000000000000 |
101 $ hg merge mytopic |
101 $ hg merge mytopic |
102 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 |
103 (branch merge, don't forget to commit) |
103 (branch merge, don't forget to commit) |
104 $ hg commit -m "merge mytopic" |
104 $ hg commit -m "merge mytopic" |
105 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) |
106 (see 'hg help -e topic.topic-mode' for details) |
107 |
107 |
108 $ hg log -G |
108 $ hg log -G |
109 @ changeset: 3:676a445d1c09 |
109 @ changeset: 3:676a445d1c09 |
110 |\ tag: tip |
110 |\ tag: tip |
111 | | parent: 2:a4da109ee59f |
111 | | parent: 2:a4da109ee59f |