64 parent: -1:000000000000 |
64 parent: -1:000000000000 |
65 user: test |
65 user: test |
66 date: Thu Jan 01 00:00:00 1970 +0000 |
66 date: Thu Jan 01 00:00:00 1970 +0000 |
67 summary: added a' |
67 summary: added a' |
68 |
68 |
|
69 |
|
70 Testing the new config knob to warn about untopiced merge commit |
|
71 ================================================================ |
|
72 |
|
73 $ hg init $TESTTMP/test-untopic-merge-commit |
|
74 $ cd $TESTTMP/test-untopic-merge-commit |
|
75 $ cat <<EOF >> .hg/hgrc |
|
76 > [phases] |
|
77 > publish=false |
|
78 > EOF |
|
79 $ cat <<EOF >> $HGRCPATH |
|
80 > [experimental] |
|
81 > topic-mode = enforce |
|
82 > EOF |
|
83 $ touch ROOT |
|
84 $ hg commit -A -m "ROOT" --config experimental.topic-mode=off |
|
85 adding ROOT |
|
86 $ touch a |
|
87 $ hg add a |
|
88 $ hg topic mytopic |
|
89 marked working directory as topic: mytopic |
|
90 $ hg ci -m "Added a" |
|
91 active topic 'mytopic' grew its first changeset |
|
92 |
|
93 $ hg up -r "desc('ROOT')" |
|
94 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
95 $ touch default |
|
96 $ hg add default |
|
97 $ hg commit -m "default" --config experimental.topic-mode=off |
|
98 |
|
99 $ hg merge mytopic |
|
100 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 (branch merge, don't forget to commit) |
|
102 $ hg commit -m "merge mytopic" |
|
103 warning: new draft commit without topic |
|
104 |
|
105 $ hg log -G |
|
106 @ changeset: 3:676a445d1c09 |
|
107 |\ tag: tip |
|
108 | | parent: 2:a4da109ee59f |
|
109 | | parent: 1:e5b6c632bd8e |
|
110 | | user: test |
|
111 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
112 | | summary: merge mytopic |
|
113 | | |
|
114 | o changeset: 2:a4da109ee59f |
|
115 | | parent: 0:ec1d2790416d |
|
116 | | user: test |
|
117 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
118 | | summary: default |
|
119 | | |
|
120 o | changeset: 1:e5b6c632bd8e |
|
121 |/ topic: mytopic |
|
122 | user: test |
|
123 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
124 | summary: Added a |
|
125 | |
|
126 o changeset: 0:ec1d2790416d |
|
127 user: test |
|
128 date: Thu Jan 01 00:00:00 1970 +0000 |
|
129 summary: ROOT |
|
130 |