Mercurial > hg-stable

annotate tests/test-atomictempfile.py.out @ 15673:d550168f11ce stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: check filename case collision between changesets for branch merging this patch makes branch merging abort when merged changesets have same file in different case on case insensitive filesystem. this patch does not prevent linear update which merges between target and working contexts, because 'branchmerge' is False in such case.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Fri, 16 Dec 2011 21:21:27 +0900
parents d764463b433e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14007
d764463b433e atomictempfile: avoid infinite recursion in __del__().
Greg Ward <greg@gerg.ca>
parents:
diff changeset
1 OK
d764463b433e atomictempfile: avoid infinite recursion in __del__().
Greg Ward <greg@gerg.ca>
parents:
diff changeset
2 OK
d764463b433e atomictempfile: avoid infinite recursion in __del__().
Greg Ward <greg@gerg.ca>
parents:
diff changeset
3 OK