Mercurial > hg
comparison tests/test-graft.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 | bdc0e04df243 |
| children | a3c2d9211294 |
comparison
equal
deleted
inserted
replaced
| 22896:7e9cbb9c6053 | 22897:8fe74328f700 |
|---|---|
| 90 HG: Enter commit message. Lines beginning with 'HG:' are removed. | 90 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
| 91 HG: Leave message empty to abort commit. | 91 HG: Leave message empty to abort commit. |
| 92 HG: -- | 92 HG: -- |
| 93 HG: user: foo | 93 HG: user: foo |
| 94 HG: branch 'default' | 94 HG: branch 'default' |
| 95 HG: changed b | 95 HG: added b |
| 96 HG: removed a | 96 HG: removed a |
| 97 $ hg export tip --git | 97 $ hg export tip --git |
| 98 # HG changeset patch | 98 # HG changeset patch |
| 99 # User foo | 99 # User foo |
| 100 # Date 0 0 | 100 # Date 0 0 |