This is an archive of the discontinued Mercurial Phabricator instance.

drawdag: allow override file contents via comments
ClosedPublic

Authored by quark on Aug 14 2017, 10:24 AM.

Details

Summary

This makes drawdag more flexible, and allow us to create non-clean merges in
test cases.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 14 2017, 10:24 AM
martinvonz added inline comments.
tests/test-drawdag.t
243

Does it support creating graphs of resolved conflicts as follows?

> C       # A/f = a
> |\      # B/f = b
> A B     # C/f = c
quark added inline comments.Aug 14 2017, 1:41 PM
tests/test-drawdag.t
243

Yes. I uses = to indicate "replace the content". In the future we might want += to do "append content" etc.

quark added a comment.EditedAug 14 2017, 1:42 PM

Wait, I guess I know what you're saying. Let me double check.

UPDATE: Seems it works without modification.

quark updated this revision to Diff 872.Aug 14 2017, 1:54 PM
martinvonz accepted this revision.Aug 14 2017, 1:58 PM
This revision is now accepted and ready to land.Aug 14 2017, 1:58 PM
This revision was automatically updated to reflect the committed changes.