This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6307

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

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG818051048c2e: tests: show IMM is broken when merging file empty in destination
rHG7a1ae0632829: tests: show IMM is broken when merging file empty in destination
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
pulkit added a comment.Apr 24 2019, 1:10 PM

This series is meant for stable branch.

martinvonz added a subscriber: martinvonz.Apr 24 2019, 1:30 PM
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
Closed by commit rHG7a1ae0632829: tests: show IMM is broken when merging file empty in destination (authored by pulkit). · Explain WhyApr 24 2019, 3:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-inmemory.t (39 lines)

Diff 14915

tests/test-rebase-inmemory.t

o 1: 02952614a83d 'd' o 1: 02952614a83d 'd'
| |
o 0: b173517d0057 'a' o 0: b173517d0057 'a'
$ hg rebase -b 5 -d tip $ hg rebase -b 5 -d tip
rebasing 3:ca58782ad1e4 "b" rebasing 3:ca58782ad1e4 "b"
rebasing 5:71cb43376053 "merge" rebasing 5:71cb43376053 "merge"
note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes note: not rebasing 5:71cb43376053 "merge", its destination already has all its changes
$ cd ..
Test rebasing when the file we are merging in destination is empty
$ hg init test
$ cd test
$ echo a > foo
martinvonzUnsubmitted
Not Done

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.)

martinvonz: It seems like it would be a little easier to read the test (the diffs in particular) if a…
$ hg ci -Aqm 'added a to foo'
$ rm foo
$ touch foo
martinvonzUnsubmitted
Not Done

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

martinvonz: You could use `printf "" > foo` instead of these two lines
$ hg di
diff --git a/foo b/foo
--- a/foo
+++ b/foo
@@ -1,1 +0,0 @@
-a
$ hg ci -m "make foo an empty file"
$ hg up '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b > foo
martinvonzUnsubmitted
Not Done

Just echo will do that

martinvonz: Just `echo` will do that
$ hg di
diff --git a/foo b/foo
--- a/foo
+++ b/foo
@@ -1,1 +1,1 @@
-a
+b
$ hg ci -m "add b to foo"
martinvonzUnsubmitted
Not Done

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)

martinvonz: But this time you're keeping a newline. Could you make that clearer in the commit messages?
created new head
$ hg rebase -r . -d 1 --config ui.merge=internal:merge3
rebasing 2:fb62b706688e "add b to foo" (tip)
merging foo
abort: foo.orig@e780cf6f9041: not found in manifest!
[255]