annotate tests/test-empty-dir.t @ 29181:dae38633eba8 stable

localrepo: prevent executable-bit only changes from being lost on amend If you have just executable-bit change and amend it twice it will vanish: * After the first amend the commit will have the proper executable bit set in manifest but it won't have the the file on the list of files in changelog. * The second amend will read the wrong list of files from changelog and it will copy the manifest entry from parent for this file. * Voila! The change is lost. This change repairs the bug in localrepo causing this and adds a test for it.
author Mateusz Kwapich <mitrandir@fb.com>
date Thu, 19 May 2016 14:35:22 -0700
parents 3b165c127690
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12158
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
1 $ hg init
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
2
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
3 $ echo 123 > a
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
4 $ hg add a
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
5 $ hg commit -m "first" a
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
6
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
7 $ mkdir sub
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
8 $ echo 321 > sub/b
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
9 $ hg add sub/b
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
10 $ hg commit -m "second" sub/b
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
11
12158
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
12 $ cat sub/b
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
13 321
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
14
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
15 $ hg co 0
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
16 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
17
12158
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
18 $ cat sub/b 2>/dev/null || echo "sub/b not present"
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
19 sub/b not present
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
20
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
21 $ test -d sub || echo "sub not present"
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
22 sub not present
019cd2826d21 tests: unify test-empty-dir
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
23