Mercurial > hg-stable
comparison tests/test-debugbundle.t @ 15673:d550168f11ce stable
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 | bd1cbfe5db5c |
| children | f2719b387380 |
comparison
equal
deleted
inserted
replaced
| 15672:2ebe3d0ce91d | 15673:d550168f11ce |
|---|