Mercurial > hg-stable
comparison tests/test-fastannotate-protocol.t @ 42193:7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
We were using `true` as merge tool. I think it makes the test easier
to understand if we make the conflicts explcit. It also papered over a
conflict that shouldn't have been a conflict (just a bug in copy
tracing). I've marked that "BROKEN".
Differential Revision: https://phab.mercurial-scm.org/D6252
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 14 Apr 2019 13:46:40 -0700 |
| parents | d8a7690ccc74 |
| children | 9c4204b7f3e4 |
comparison
equal
deleted
inserted
replaced
| 42192:770f5f586ae5 | 42193:7116fc614cfc |
|---|---|
| 4 > [extensions] | 4 > [extensions] |
| 5 > fastannotate= | 5 > fastannotate= |
| 6 > [fastannotate] | 6 > [fastannotate] |
| 7 > mainbranch=@ | 7 > mainbranch=@ |
| 8 > EOF | 8 > EOF |
| 9 | |
| 10 $ HGMERGE=true; export HGMERGE | |
| 11 | 9 |
| 12 setup the server repo | 10 setup the server repo |
| 13 | 11 |
| 14 $ hg init repo-server | 12 $ hg init repo-server |
| 15 $ cd repo-server | 13 $ cd repo-server |