Mercurial > evolve

comparison tests/test-evolve-content-divergent-user-independent-resolution.t @ 6805:e51dfd0e1a88 mercurial-6.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-6.1 into mercurial-6.0
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 26 Jun 2024 15:39:36 +0400
parents bd2c42680dff
children
comparison
equal deleted inserted replaced
6804:241c4fec9723 6805:e51dfd0e1a88
33 $ hg pull -uq 33 $ hg pull -uq
34 $ hg amend -d '2 0' --config devel.default-date='86400 7200' 34 $ hg amend -d '2 0' --config devel.default-date='86400 7200'
35 $ hg push -q 35 $ hg push -q
36 36
37 $ cd ../local 37 $ cd ../local
38 $ hg push --force -q 38 $ hg push -q
39 2 new content-divergent changesets 39 2 new content-divergent changesets
40 $ hg pull -q 40 $ hg pull -q
41 2 new content-divergent changesets 41 2 new content-divergent changesets
42 42
43 'local' amended desc, 'other' amended date 43 'local' amended desc, 'other' amended date