Mercurial > hg
comparison tests/test-issue522.t @ 22896:7e9cbb9c6053
dirstate: use 'm' state in otherparent to reduce ambiguity
In rebase-like operations where we abandon the second parent, we can
correctly fix up the state in setparents.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 10 Oct 2014 13:31:06 -0500 |
| parents | e2dc5397bc82 |
| children | bd625cd4e5e7 |
comparison
equal
deleted
inserted
replaced
| 22895:dfa44e25bb53 | 22896:7e9cbb9c6053 |
|---|---|
| 36 updating: foo 1/1 files (100.00%) | 36 updating: foo 1/1 files (100.00%) |
| 37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 38 (branch merge, don't forget to commit) | 38 (branch merge, don't forget to commit) |
| 39 | 39 |
| 40 $ hg debugstate | grep foo | 40 $ hg debugstate | grep foo |
| 41 n 0 -2 unset foo | 41 m 0 -2 unset foo |
| 42 | 42 |
| 43 $ hg st -A foo | 43 $ hg st -A foo |
| 44 M foo | 44 M foo |
| 45 | 45 |
| 46 $ hg ci -m 'merge' | 46 $ hg ci -m 'merge' |