Mercurial > hg
view tests/test-permissions @ 6521:a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:20:58 +0300 |
parents | b688d264a294 |
children | 6f750e76fb46 |
line wrap: on
line source
#!/bin/sh hg init t cd t echo foo > a hg add a hg commit -m "1" -d "1000000 0" hg verify chmod -r .hg/store/data/a.i hg verify 2>/dev/null || echo verify failed chmod +r .hg/store/data/a.i hg verify 2>/dev/null || echo verify failed chmod -w .hg/store/data/a.i echo barber > a hg commit -m "2" -d "1000000 0" 2>/dev/null || echo commit failed chmod -w . hg diff --nodates chmod +w .