Mercurial > hg
comparison tests/test-merge-remove.t @ 22897:8fe74328f700
dirstate: merge falls through to otherparent
This lets us more correctly fix the state when we use setparents, as
demonstrated in the change in test-graft.t.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 11 Oct 2014 14:05:09 -0500 |
| parents | 7e9cbb9c6053 |
| children | ddc17eaf0f1b |
comparison
equal
deleted
inserted
replaced
| 22896:7e9cbb9c6053 | 22897:8fe74328f700 |
|---|---|
| 20 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 20 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 21 (branch merge, don't forget to commit) | 21 (branch merge, don't forget to commit) |
| 22 | 22 |
| 23 $ hg debugstate --nodates | 23 $ hg debugstate --nodates |
| 24 m 0 -2 bar | 24 m 0 -2 bar |
| 25 m 644 14 foo1 | 25 m 0 -2 foo1 |
| 26 copy: foo -> foo1 | 26 copy: foo -> foo1 |
| 27 | 27 |
| 28 $ hg st -q | 28 $ hg st -q |
| 29 M bar | 29 M bar |
| 30 M foo1 | 30 M foo1 |
| 53 $ hg add -v foo1 bar | 53 $ hg add -v foo1 bar |
| 54 adding bar | 54 adding bar |
| 55 adding foo1 | 55 adding foo1 |
| 56 | 56 |
| 57 $ hg debugstate --nodates | 57 $ hg debugstate --nodates |
| 58 m 644 5 bar | 58 n 0 -2 bar |
| 59 m 644 14 foo1 | 59 n 0 -2 foo1 |
| 60 copy: foo -> foo1 | 60 copy: foo -> foo1 |
| 61 | 61 |
| 62 $ hg st -qC | 62 $ hg st -qC |
| 63 M bar | 63 M bar |
| 64 M foo1 | 64 M foo1 |
| 72 reverting bar | 72 reverting bar |
| 73 saving current version of foo1 as foo1.orig | 73 saving current version of foo1 as foo1.orig |
| 74 reverting foo1 | 74 reverting foo1 |
| 75 | 75 |
| 76 $ hg debugstate --nodates | 76 $ hg debugstate --nodates |
| 77 m 644 5 bar | 77 n 0 -2 bar |
| 78 m 644 14 foo1 | 78 n 0 -2 foo1 |
| 79 copy: foo -> foo1 | 79 copy: foo -> foo1 |
| 80 | 80 |
| 81 $ hg st -qC | 81 $ hg st -qC |
| 82 M bar | 82 M bar |
| 83 M foo1 | 83 M foo1 |