104 *But* Alice decided to amend the changeset she had and then pulling from public |
104 *But* Alice decided to amend the changeset she had and then pulling from public |
105 repo creating phase-divergent changeset locally |
105 repo creating phase-divergent changeset locally |
106 |
106 |
107 $ cd ../alice |
107 $ cd ../alice |
108 $ hg amend -m 'tweak a' |
108 $ hg amend -m 'tweak a' |
|
109 |
|
110 XXX: pull should tell us how to see what is the new phase-divergent changeset |
109 $ hg pull ../public |
111 $ hg pull ../public |
110 pulling from ../public |
112 pulling from ../public |
111 searching for changes |
113 searching for changes |
112 no changes found |
114 no changes found |
113 1 new phase-divergent changesets |
115 1 new phase-divergent changesets |
126 $ hg evolve --list |
128 $ hg evolve --list |
127 98bb3a6cfe1a: tweak a |
129 98bb3a6cfe1a: tweak a |
128 phase-divergent: 4d1169d82e47 (immutable precursor) |
130 phase-divergent: 4d1169d82e47 (immutable precursor) |
129 |
131 |
130 |
132 |
131 Trying to see instability on public changeset |
133 |
132 |
134 XXX-Pulkit: Trying to see instability on public changeset |
|
135 |
|
136 XXX-Pulkit: this is not helpful |
|
137 |
|
138 XXX-Marmoute: public changeset "instable themself" |
|
139 XXX-Marmoute: I'm not sure if we store this information and it is useful to show it. |
|
140 XXX-Marmoute: We should maybe point the user toward `hg obslog` instead` |
133 $ hg evolve -r 4d1169d8 --list |
141 $ hg evolve -r 4d1169d8 --list |
134 4d1169d82e47: modify a |
142 4d1169d82e47: modify a |
135 |
143 |
136 |
144 |
137 Understanding phasedivergence using obslog |
145 Understanding phasedivergence using obslog |
138 ------------------------------------------ |
146 ------------------------------------------ |
139 |
147 |
|
148 XXX: There must be mention of phase-divergence here |
140 $ hg obslog -r . --all |
149 $ hg obslog -r . --all |
141 @ 98bb3a6cfe1a (2) tweak a |
150 @ 98bb3a6cfe1a (2) tweak a |
142 | |
151 | |
143 o 4d1169d82e47 (1) modify a |
152 o 4d1169d82e47 (1) modify a |
144 rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
153 rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
145 |
154 |
146 Solving the phase divergence using evolve command |
155 Solving the phase divergence using evolve command |
147 -------------------------------------------------- |
156 -------------------------------------------------- |
|
157 |
|
158 (We do not solve evolution other than orphan by default because it turned out |
|
159 it was too confusing for users. We used to behave this way, but having multiple |
|
160 possible outcome to evolve end up scaring people) |
148 |
161 |
149 $ hg evolve |
162 $ hg evolve |
150 nothing to evolve on current working copy parent |
163 nothing to evolve on current working copy parent |
151 (do you want to use --phase-divergent) |
164 (do you want to use --phase-divergent) |
152 [2] |
165 [2] |
168 atop:[1] modify a |
181 atop:[1] modify a |
169 hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e; |
182 hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e; |
170 hg update 4d1169d82e47; |
183 hg update 4d1169d82e47; |
171 hg revert --all --rev 98bb3a6cfe1a; |
184 hg revert --all --rev 98bb3a6cfe1a; |
172 hg commit --msg "phase-divergent update to 98bb3a6cfe1a" |
185 hg commit --msg "phase-divergent update to 98bb3a6cfe1a" |
|
186 |
|
187 XXX: evolve should have mentioned that draft commit is just obsoleted in favour |
|
188 of public one. From the message it looks like a new commit is created. |
173 |
189 |
174 $ hg evolve --phase-divergent |
190 $ hg evolve --phase-divergent |
175 recreate:[2] tweak a |
191 recreate:[2] tweak a |
176 atop:[1] modify a |
192 atop:[1] modify a |
177 computing new diff |
193 computing new diff |