Show More
@@ -75,7 +75,7 b' This used to trigger a "divergent rename' | |||
|
75 | 75 | $ hg cp b b3 |
|
76 | 76 | $ hg cp b b4 |
|
77 | 77 | $ hg ci -A -m 'copy b twice' |
|
78 | $ hg up eb92d88a9712 | |
|
78 | $ hg up '.^' | |
|
79 | 79 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
80 | 80 | $ hg up |
|
81 | 81 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -87,7 +87,7 b" We'd rather not warn on divergent rename" | |||
|
87 | 87 | $ hg cp b b3 |
|
88 | 88 | $ hg mv b b4 |
|
89 | 89 | $ hg ci -A -m 'divergent renames in same changeset' |
|
90 | $ hg up c761c6948de0 | |
|
90 | $ hg up '.^' | |
|
91 | 91 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
92 | 92 | $ hg up |
|
93 | 93 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now