Mercurial > evolve

comparison tests/test-evolve-content-divergent-corner-cases.t @ 6401:716912541759 mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 07 Feb 2023 10:51:10 +0400
parents 67fc03f42d92 e5bd76f95145
children
comparison
equal deleted inserted replaced
6355:4cf673319dfc 6401:716912541759
377 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a 377 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 5f6d8a4bf34a
378 file 'd' was deleted in local but was modified in other. 378 file 'd' was deleted in local but was modified in other.
379 What do you want to do? 379 What do you want to do?
380 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c 380 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
381 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 381 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
382 working directory is now at 050a5d9ba60d 382 working directory is now at 8bcf0a598b0d
383 383
384 $ hg glog -l1 384 $ hg glog -l1
385 @ 8:050a5d9ba60d updated e 385 @ 8:8bcf0a598b0d updated e
386 | () [default] draft 386 | () [default] draft
387 ~ 387 ~
388 388
389 $ hg debugobsolete 389 $ hg debugobsolete
390 8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 ff6f7cd76a7c97d938e8fe87f0fc816b66929435 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} 390 8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 ff6f7cd76a7c97d938e8fe87f0fc816b66929435 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
391 8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 de4ea3103326293994c634101e780724346ee89f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} 391 8d71eadcc9dfb21a924e75a5796c2f011bdc55a4 de4ea3103326293994c634101e780724346ee89f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
392 9150fe93bec603cd88d05cda9f6ff13420cb53e9 0 {155349b645beebee15325a9a22dd0c9ef8fbbbd3} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} 392 9150fe93bec603cd88d05cda9f6ff13420cb53e9 0 {155349b645beebee15325a9a22dd0c9ef8fbbbd3} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
393 ff6f7cd76a7c97d938e8fe87f0fc816b66929435 8883bfaa2d02c8c54b6278551324187019862599 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} 393 ff6f7cd76a7c97d938e8fe87f0fc816b66929435 8da34ee32eee606a1fca89e76ce48dcfb0e2598b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
394 8883bfaa2d02c8c54b6278551324187019862599 050a5d9ba60d423b4401803509457515297edcf4 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} 394 8da34ee32eee606a1fca89e76ce48dcfb0e2598b 8bcf0a598b0d242cb58758d78acd77e874251eef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
395 de4ea3103326293994c634101e780724346ee89f 050a5d9ba60d423b4401803509457515297edcf4 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} 395 de4ea3103326293994c634101e780724346ee89f 8bcf0a598b0d242cb58758d78acd77e874251eef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
396 $ hg obslog --all 396 $ hg obslog --all
397 @ 050a5d9ba60d (8) updated e 397 @ 8bcf0a598b0d (8) updated e
398 |\ amended(content) from 8883bfaa2d02 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 398 |\ amended(content) from 8da34ee32eee using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
399 | | rewritten from de4ea3103326 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 399 | | rewritten from de4ea3103326 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
400 | | 400 | |
401 x | 8883bfaa2d02 (7) updated e 401 x | 8da34ee32eee (7) updated e
402 | | rebased(parent) from ff6f7cd76a7c using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 402 | | rebased(parent) from ff6f7cd76a7c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
403 | | 403 | |
404 | x de4ea3103326 (6) updated e 404 | x de4ea3103326 (6) updated e
405 | | rewritten(description, parent, content) from 8d71eadcc9df using prune by test (Thu Jan 01 00:00:00 1970 +0000) 405 | | rewritten(description, parent, content) from 8d71eadcc9df using prune by test (Thu Jan 01 00:00:00 1970 +0000)
406 | | 406 | |