Mercurial > hg
view contrib/plan9/proto @ 31174:842489d18118
tests: fix test-update-branches to remove non-conflicting file
I was clearly very sloppy when I wrote the test case for
experimental.updatecheck=noconflict. The test case that checks that
one can move between commits with a removed file was deleting a file
that was modified between the source and target commits, which
resulted in a "change/delete" conflict. Since that is a conlict, the
update correctly failed. Let's fix the test by removing a file that is
not modified between the two commits.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 06 Mar 2017 23:19:57 -0800 |
parents | cf137319c6cd |
children |
line wrap: on
line source
lib - sys sys mercurial - sys sys hgrc.d - sys sys 9diff.rc - sys sys factotum.rc - sys sys rc - sys sys bin - sys sys 9diff - sys sys hg - sys sys sys - sys sys lib - sys sys python - sys sys lib - sys sys python2.5 - sys sys site-packages - sys sys hgext - sys sys + - sys sys mercurial - sys sys + - sys sys mercurial-VERSION-py2.5.egg-info - sys sys src - sys sys cmd - sys sys hg - sys sys + - sys sys