Mercurial > hg

comparison tests/test-rename-merge1.t @ 16792:ad394c897b16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: do not warn about copy and rename in the same transaction (issue2113)
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 23 May 2012 17:25:48 +0200
parents efdcce3fd2d5
children 9cbc44a6600e
comparison
equal deleted inserted replaced
16778:2ac08d8b21aa 16792:ad394c897b16
93 $ hg mv b b4 93 $ hg mv b b4
94 $ hg ci -A -m 'divergent renames in same changeset' 94 $ hg ci -A -m 'divergent renames in same changeset'
95 $ hg up c761c6948de0 95 $ hg up c761c6948de0
96 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 96 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
97 $ hg up 97 $ hg up
98 note: possible conflict - b was renamed multiple times to:
99 b3
100 b4
101 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 98 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
102 99
103 Check for issue2642 100 Check for issue2642
104 101
105 $ hg init t 102 $ hg init t