view contrib/plan9/proto @ 19966:7985e3469f58 stable

largefiles: systematic testing of merges to/from largefiles

427ce5633c1c fixed one problem with update and added a test case for it. The
test coverage was thus insufficient before that.

To make sure we have good test coverage in this area we add systematic testing
of all cases of merges that may or may not change normal files to largefiles or
vice versa.

The tests shows some annoying extra merge prompts in some cases, but these
prompts are hard to avoid and they are now "safe" - they do not leave the
system in a confused inconsistent state.

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