Mercurial > evolve

comparison tests/test-evolve-content-divergent-meta.t @ 4577:bcd52ce0916d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: don't update after instability resolution by default (BC)
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 24 Apr 2019 15:59:02 +0200
parents 02d3177085e1
children a4fde4e3e763
comparison
equal deleted inserted replaced
4576:96ce1030d2fb 4577:bcd52ce0916d
87 with: [4] added c 87 with: [4] added c
88 base: [2] added c 88 base: [2] added c
89 updating to "local" side of the conflict: 0c9267e23c9d 89 updating to "local" side of the conflict: 0c9267e23c9d
90 merging "other" content-divergent changeset '6c06cda6dc99' 90 merging "other" content-divergent changeset '6c06cda6dc99'
91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
92 working directory is now at 443bd2972210
93 92
94 Make sure resultant cset don't replace the initial user with user running the command: 93 Make sure resultant cset don't replace the initial user with user running the command:
95 $ hg log -r tip 94 $ hg log -r tip
96 changeset: 5:443bd2972210 95 changeset: 5:443bd2972210
97 tag: tip 96 tag: tip