206 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
206 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
207 nothing changed |
207 nothing changed |
208 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
208 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
209 11 bb2424887202 1970-01-01 00:00 +0000: |
209 11 bb2424887202 1970-01-01 00:00 +0000: |
210 13 bb2424887202 1970-01-01 00:02 +0000: (false !) |
210 13 bb2424887202 1970-01-01 00:02 +0000: (false !) |
|
211 |
|
212 date: updated each side to a different value, newer should win |
|
213 |
|
214 $ hg amend --date "235 0" |
|
215 $ hg update --hidden --rev 'predecessors(.)' |
|
216 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
217 updated to hidden changeset bb2424887202 |
|
218 (hidden revision 'bb2424887202' was rewritten as: 48132e92d706) |
|
219 working directory parent is obsolete! (bb2424887202) |
|
220 (use 'hg evolve' to update to its successor: 48132e92d706) |
|
221 $ hg amend --date "784 0" |
|
222 2 new content-divergent changesets |
|
223 $ hg log -G |
|
224 @ changeset: 14:694c3cf6b929 |
|
225 | tag: tip |
|
226 | parent: 0:a24ed8ad918c |
|
227 | user: test |
|
228 | date: Thu Jan 01 00:13:04 1970 +0000 |
|
229 | instability: content-divergent |
|
230 | summary: add foo.txt |
|
231 | |
|
232 | * changeset: 13:48132e92d706 |
|
233 |/ parent: 0:a24ed8ad918c |
|
234 | user: test |
|
235 | date: Thu Jan 01 00:03:55 1970 +0000 |
|
236 | instability: content-divergent |
|
237 | summary: add foo.txt |
|
238 | |
|
239 o changeset: 0:a24ed8ad918c |
|
240 user: test |
|
241 date: Thu Jan 01 00:00:00 1970 +0000 |
|
242 summary: add r0 |
|
243 |
|
244 $ hg evolve --list -r . |
|
245 694c3cf6b929: add foo.txt |
|
246 content-divergent: 48132e92d706 (draft) (precursor bb2424887202) |
|
247 |
|
248 $ hg log -r bb2424887202+48132e92d706+694c3cf6b929 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
249 11 bb2424887202 1970-01-01 00:00 +0000: date-changed using amend as 14:694c3cf6b929; date-changed using amend as 13:48132e92d706 |
|
250 13 48132e92d706 1970-01-01 00:03 +0000: |
|
251 14 694c3cf6b929 1970-01-01 00:13 +0000: |
|
252 $ hg evolve --content-divergent |
|
253 merge:[13] add foo.txt |
|
254 with: [14] add foo.txt |
|
255 base: [12] add foo.txt |
|
256 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
257 working directory is now at a24ed8ad918c |
|
258 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
259 0 a24ed8ad918c 1970-01-01 00:00 +0000: |
|
260 16 bb2424887202 1970-01-01 00:13 +0000: (false !) |