This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7a1ae0632829: tests: show IMM is broken when merging file
empty in destination (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/
pulkit updated this revision to Diff 14912.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6307?vs=14909&id=14912
REVISION DETAIL
https://phab.mercurial-scm.org/D6307
AFFECTED FILES
tests/test-rebase-inmemory.t
CHANGE DETAILS
diff --git a/tests/test
pulkit updated this revision to Diff 14909.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6307?vs=14906&id=14909
REVISION DETAIL
https://phab.mercurial-scm.org/D6307
AFFECTED FILES
tests/test-rebase-inmemory.t
CHANGE DETAILS
diff --git a/tests/test
martinvonz added inline comments.
INLINE COMMENTS
> test-rebase-inmemory.t:770
> + $ cd test
> + $ echo " " > foo
> + $ hg ci -Aqm 'added foo'
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 does
pulkit added a comment.
This series is meant for stable branch.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6307
To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercuri
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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
