##// END OF EJS Templates
test: enable sparse-revlog for test-clonebundles.t...
test: enable sparse-revlog for test-clonebundles.t We are about to enable sparse-revlog globally. To help with reviewing the tests change, we isolate them in individual changesets. Differential Revision: https://phab.mercurial-scm.org/D5316

File last commit:

r34662:eb586ed5 default
r40925:abac9d18 default
Show More
test-issue1802.t
73 lines | 1.7 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: replace exit 80 with #require
r22046 #require execbit
Mads Kiilerich
tests: use 'hghave execbit' for tests that manipulate x bit in file system
r15442
Matt Mackall
windows: recompute flags when committing a merge (issue1802)...
r15337 Create extension that can disable exec checks:
$ cat > noexec.py <<EOF
> from mercurial import extensions, util
> def setflags(orig, f, l, x):
> pass
> def checkexec(orig, path):
> return False
> def extsetup(ui):
> extensions.wrapfunction(util, 'setflags', setflags)
> extensions.wrapfunction(util, 'checkexec', checkexec)
> EOF
$ hg init unix-repo
$ cd unix-repo
$ touch a
$ hg add a
$ hg commit -m 'unix: add a'
$ hg clone . ../win-repo
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ chmod +x a
$ hg commit -m 'unix: chmod a'
$ hg manifest -v
755 * a
$ cd ../win-repo
$ touch b
$ hg add b
$ hg commit -m 'win: add b'
$ hg manifest -v
644 a
644 b
$ hg pull
pulling from $TESTTMP/unix-repo
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 2d8bcf2dda39
Matt Mackall
windows: recompute flags when committing a merge (issue1802)...
r15337 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg manifest -v -r tip
755 * a
Simulate a Windows merge:
$ hg --config extensions.n=$TESTTMP/noexec.py merge --debug
searching for copies back to rev 1
unmatched files in local:
b
resolving manifests
Siddharth Agarwal
manifestmerge: pass in branchmerge and force separately...
r18605 branchmerge: True, force: False, partial: False
Martin Geisler
merge: make debug output easier to read...
r15625 ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
Matt Mackall
windows: recompute flags when committing a merge (issue1802)...
r15337 a: update permissions -> e
Mads Kiilerich
merge: changing the mode of a file is also an update...
r18334 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
windows: recompute flags when committing a merge (issue1802)...
r15337 (branch merge, don't forget to commit)
Simulate a Windows commit:
$ hg --config extensions.n=$TESTTMP/noexec.py commit -m 'win: merge'
$ hg manifest -v
755 * a
644 b
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..