Mercurial > hg
annotate tests/bzr-definitions @ 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 | 89872688893f |
children | 7a88643bc0ef |
rev | line source |
---|---|
7053 | 1 # this file holds the definitions that are used in various bzr tests |
2 | |
9042
95046688f80f
tests: remove more instances of export FOO=bar bashism
Brodie Rao <me+hg@dackz.net>
parents:
8523
diff
changeset
|
3 TERM=dumb; export TERM |
7053 | 4 echo '[extensions]' >> $HGRCPATH |
5 echo 'convert = ' >> $HGRCPATH | |
6 | |
7 glog() | |
8 { | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
16060
diff
changeset
|
9 hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@" |
7053 | 10 } |
11 | |
12 manifest() | |
13 { | |
14 echo "% manifest of $2" | |
15 hg -R $1 manifest -v -r $2 | |
16 } |