Mercurial > hg-stable
comparison tests/test-copies-chain-merge.t @ 44471:68e14fecd82a
copies-tests: swap two branch description
They were swapped and now match their intended block.
Differential Revision: https://phab.mercurial-scm.org/D8247
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 06 Mar 2020 11:02:02 +0100 |
| parents | 7b1f516e7606 |
| children | b8882f5d7cb4 |
comparison
equal
deleted
inserted
replaced
| 44470:9d2b2df2c2ba | 44471:68e14fecd82a |
|---|---|
| 37 o 1 i-1: a -move-> c] | 37 o 1 i-1: a -move-> c] |
| 38 | | 38 | |
| 39 o 0 i-0 initial commit: a b] | 39 o 0 i-0 initial commit: a b] |
| 40 | 40 |
| 41 | 41 |
| 42 Have a branching with nothing on one side | 42 And having another branch with renames on the other side |
| 43 | 43 |
| 44 $ hg mv d e | 44 $ hg mv d e |
| 45 $ hg ci -Am 'a-1: d -move-> e' | 45 $ hg ci -Am 'a-1: d -move-> e' |
| 46 $ hg mv e f | 46 $ hg mv e f |
| 47 $ hg ci -Am 'a-2: e -move-> f' | 47 $ hg ci -Am 'a-2: e -move-> f' |
| 55 o 1 i-1: a -move-> c] | 55 o 1 i-1: a -move-> c] |
| 56 | | 56 | |
| 57 o 0 i-0 initial commit: a b] | 57 o 0 i-0 initial commit: a b] |
| 58 | 58 |
| 59 | 59 |
| 60 And Having another branch with renames on the other side | 60 Have a branching with nothing on one side |
| 61 | 61 |
| 62 $ hg up 'desc("i-2")' | 62 $ hg up 'desc("i-2")' |
| 63 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 63 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 64 $ echo foo > b | 64 $ echo foo > b |
| 65 $ hg ci -m 'b-1: b update' | 65 $ hg ci -m 'b-1: b update' |