Page MenuHomePhabricator

tests: show IMM is broken when merging file empty in destination
ClosedPublic

Authored by pulkit on Apr 24 2019, 1:09 PM.

Details

Summary

When we are doing in-memory merging, and we are merging a file which is empty in
merge destination, it leads to error 'abort: xxx not found in manifest'.

Next patch will fix this error.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Apr 24 2019, 1:09 PM

This series is meant for stable branch.

martinvonz added inline comments.
tests/test-rebase-inmemory.t
770

It seems like it would be a little easier to read the test (the diffs in particular) if a visible character was used. (I assume that the content doesn't matter and you used whitespace only because it's a realistic thing to remove.)

773–774

You could use printf "" > foo instead of these two lines

786

Just echo will do that

794

But this time you're keeping a newline. Could you make that clearer in the commit messages? Something like "make file empty" for the first one and "keep only newline" for the second (feel free to describe it differently, though)

pulkit updated this revision to Diff 14909.Apr 24 2019, 2:22 PM
pulkit updated this revision to Diff 14912.Apr 24 2019, 2:30 PM
This revision was automatically updated to reflect the committed changes.