equal
deleted
inserted
replaced
1 # Test issue 746: renaming files brought by the |
1 Test issue 746: renaming files brought by the second parent of a merge |
2 # second parent of a merge was broken. |
2 was broken. |
3 |
3 |
4 Create source repository: |
4 Create source repository: |
5 |
5 |
6 $ hg init t |
6 $ hg init t |
7 $ cd t |
7 $ cd t |
57 $ hg st |
57 $ hg st |
58 M b |
58 M b |
59 |
59 |
60 $ cd .. |
60 $ cd .. |
61 |
61 |
62 # Test issue 1476: renaming a first parent file into |
62 Test issue 1476: renaming a first parent file into another first |
63 # another first parent file while none of them belong to |
63 parent file while none of them belong to the second parent was broken |
64 # the second parent was broken |
|
65 |
64 |
66 $ hg init repo1476 |
65 $ hg init repo1476 |
67 $ cd repo1476 |
66 $ cd repo1476 |
68 $ echo a > a |
67 $ echo a > a |
69 $ hg ci -Am adda |
68 $ hg ci -Am adda |