Mercurial > evolve
comparison tests/test-touch.t @ 5134:d9b1336f7d1c
tests: add test of `hg touch -A`
There didn't seem to be any before. It currently passes because the
test case incorrectly (IMO) sets `evolution.allowdivergence = True`.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 04 Feb 2020 13:43:16 -0800 |
| parents | 1f92a6aa40d6 |
| children | 731b5a89a784 |
comparison
equal
deleted
inserted
replaced
| 5131:53dd70f557aa | 5134:d9b1336f7d1c |
|---|---|
| 221 [1] modified c | 221 [1] modified c |
| 222 reviving this changeset will create divergence unless you make a duplicate. | 222 reviving this changeset will create divergence unless you make a duplicate. |
| 223 (a)llow divergence or (d)uplicate the changeset? a | 223 (a)llow divergence or (d)uplicate the changeset? a |
| 224 2 new content-divergent changesets | 224 2 new content-divergent changesets |
| 225 | 225 |
| 226 But -A allows divergence | |
| 227 | |
| 228 $ hg touch -r "desc('modified c')" --hidden -A | |
| 229 1 new content-divergent changesets | |
| 230 | |
| 226 $ cd .. | 231 $ cd .. |