Mercurial > hg
annotate tests/bzr-definitions @ 48152:8f88307f8e07
dirstate-item: replace another usage of `merged`
We simply spell out the logic here. This was the last usage of `merged`.
Differential Revision: https://phab.mercurial-scm.org/D11596
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 01 Oct 2021 03:29:33 +0200 |
parents | 7a88643bc0ef |
children |
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 { | |
39222
7a88643bc0ef
tests: show added/modified/removed files when logging repos converted from bzr
Matt Harbison <matt_harbison@yahoo.com>
parents:
26066
diff
changeset
|
9 hg log -G --template '{rev}@{branch} "{desc|firstline}" files+: [{file_adds}], files-: [{file_dels}], files: [{file_mods}]\n' "$@" |
7053 | 10 } |
11 | |
12 manifest() | |
13 { | |
14 echo "% manifest of $2" | |
15 hg -R $1 manifest -v -r $2 | |
16 } |