91 base: [2] added c |
91 base: [2] added c |
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93 |
93 |
94 Make sure resultant cset don't replace the initial user with user running the command: |
94 Make sure resultant cset don't replace the initial user with user running the command: |
95 $ hg log -r tip |
95 $ hg log -r tip |
96 changeset: 5:443bd2972210 |
96 changeset: 5:8cabe7248d20 |
97 tag: tip |
97 tag: tip |
98 parent: 1:1740ad2a1eda |
98 parent: 1:1740ad2a1eda |
99 user: foo <foo@test.com> |
99 user: foo <foo@test.com> |
100 date: Thu Jan 01 00:00:00 1970 +0000 |
100 date: Thu Jan 01 00:00:00 1970 +0000 |
101 summary: added c e |
101 summary: added c e |
131 $ hg evolve --content-divergent |
131 $ hg evolve --content-divergent |
132 merge:[3] updated c |
132 merge:[3] updated c |
133 with: [4] added c |
133 with: [4] added c |
134 base: [2] added c |
134 base: [2] added c |
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
135 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
136 working directory is now at 932d6ceb7672 |
136 working directory is now at 2300a271820b |
137 |
137 |
138 $ hg log -r tip | grep "^user" |
138 $ hg log -r tip | grep "^user" |
139 user: foouser |
139 user: foouser |
140 |
140 |
141 $ hg strip . -q --config extensions.strip= |
141 $ hg strip . -q --config extensions.strip= |
152 $ hg evolve --content-divergent |
152 $ hg evolve --content-divergent |
153 merge:[4] added c |
153 merge:[4] added c |
154 with: [5] updated c |
154 with: [5] updated c |
155 base: [2] added c |
155 base: [2] added c |
156 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
156 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
157 working directory is now at 202a770d8c1f |
157 working directory is now at 3d7ae55fbfe4 |
158 |
158 |
159 $ hg log -r tip | grep "^user" |
159 $ hg log -r tip | grep "^user" |
160 user: baruser, foouser |
160 user: baruser, foouser |
161 |
161 |
162 $ cd .. |
162 $ cd .. |
217 $ hg evolve --content-divergent |
217 $ hg evolve --content-divergent |
218 merge:[3] add foo.txt |
218 merge:[3] add foo.txt |
219 with: [4] add foo.txt |
219 with: [4] add foo.txt |
220 base: [1] add foo.txt |
220 base: [1] add foo.txt |
221 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
221 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
222 working directory is now at 6c144bb30333 |
222 working directory is now at bbcfcd9b9e21 |
223 $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
223 $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
224 5 6c144bb30333 1969-12-31 23:59 -0000: |
224 5 bbcfcd9b9e21 1969-12-31 23:59 -0000: |
225 |
225 |
226 date: updated one one side to an older value |
226 date: updated one one side to an older value |
227 |
227 |
228 $ hg strip . |
228 $ hg strip . |
229 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
229 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
230 saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/6c144bb30333-72e26b88-backup.hg |
230 saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/bbcfcd9b9e21-567273f3-backup.hg |
231 2 new content-divergent changesets |
231 2 new content-divergent changesets |
232 $ hg up tip |
232 $ hg up tip |
233 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
233 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
234 $ hg amend --date "0 3" |
234 $ hg amend --date "0 3" |
235 $ hg log -G |
235 $ hg log -G |
264 $ hg evolve --content-divergent |
264 $ hg evolve --content-divergent |
265 merge:[3] add foo.txt |
265 merge:[3] add foo.txt |
266 with: [5] add foo.txt |
266 with: [5] add foo.txt |
267 base: [1] add foo.txt |
267 base: [1] add foo.txt |
268 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
268 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
269 working directory is now at 806d0024c04d |
269 working directory is now at 4708538fed7d |
270 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
270 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
271 6 806d0024c04d 1969-12-31 23:59 -0000: |
271 6 4708538fed7d 1969-12-31 23:59 -0000: |
272 |
272 |
273 date: updated one side to an newer value |
273 date: updated one side to an newer value |
274 |
274 |
275 $ hg strip . |
275 $ hg strip . |
276 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
276 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
277 saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/806d0024c04d-24cb28ad-backup.hg |
277 saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/4708538fed7d-ca550351-backup.hg |
278 2 new content-divergent changesets |
278 2 new content-divergent changesets |
279 $ hg update a25dd7af6cf6 --hidden |
279 $ hg update a25dd7af6cf6 --hidden |
280 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
280 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
281 $ hg amend --date "120 0" |
281 $ hg amend --date "120 0" |
282 $ hg log -G |
282 $ hg log -G |
313 $ hg evolve --content-divergent |
313 $ hg evolve --content-divergent |
314 merge:[5] add foo.txt |
314 merge:[5] add foo.txt |
315 with: [6] add foo.txt |
315 with: [6] add foo.txt |
316 base: [1] add foo.txt |
316 base: [1] add foo.txt |
317 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
317 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
318 working directory is now at 51e08ac59670 |
318 working directory is now at dbea1c7e245d |
319 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
319 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
320 7 51e08ac59670 1970-01-01 00:02 +0000: |
320 7 dbea1c7e245d 1970-01-01 00:02 +0000: |
321 |
321 |
322 date: updated each side to a different value, newer should win |
322 date: updated each side to a different value, newer should win |
323 |
323 |
324 $ hg strip . |
324 $ hg strip . |
325 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
325 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
326 saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/51e08ac59670-d8a3c2ca-backup.hg |
326 saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/dbea1c7e245d-47ae3d98-backup.hg |
327 2 new content-divergent changesets |
327 2 new content-divergent changesets |
328 $ hg up tip |
328 $ hg up tip |
329 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
329 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
330 $ hg amend --date "235 0" |
330 $ hg amend --date "235 0" |
331 $ hg update 6189a9adfff0 --hidden |
331 $ hg update 6189a9adfff0 --hidden |
363 $ hg evolve --content-divergent |
363 $ hg evolve --content-divergent |
364 merge:[7] add foo.txt |
364 merge:[7] add foo.txt |
365 with: [8] add foo.txt |
365 with: [8] add foo.txt |
366 base: [1] add foo.txt |
366 base: [1] add foo.txt |
367 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
367 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
368 working directory is now at ab7c0a425dc9 |
368 working directory is now at 10c950c7c11f |
369 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
369 $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
370 9 ab7c0a425dc9 1970-01-01 00:13 +0000: |
370 9 10c950c7c11f 1970-01-01 00:13 +0000: |
371 |
371 |
372 $ cd .. |
372 $ cd .. |