Mercurial > evolve

comparison tests/test-drop.t @ 2594:a3fbe5293bf6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Boris Feld <boris.feld@octobus.net>
date Fri, 16 Jun 2017 11:32:21 +0200
parents cbc7a69116bd
children 6e5f5de46c50
comparison
equal deleted inserted replaced
2557:e3acb8823900 2594:a3fbe5293bf6
1 1
2 $ cat >> $HGRCPATH <<EOF 2 $ cat >> $HGRCPATH <<EOF
3 > [extensions] 3 > [extensions]
4 > hgext.graphlog= 4 > hgext.graphlog=
5 > EOF 5 > EOF
6 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
6 $ echo "drophack=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/drophack.py" >> $HGRCPATH 7 $ echo "drophack=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/drophack.py" >> $HGRCPATH
7 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
8 $ mkcommit() { 8 $ mkcommit() {
9 > echo "$1" > "$1" 9 > echo "$1" > "$1"
10 > hg add "$1" 10 > hg add "$1"
11 > hg ci -m "add $1" 11 > hg ci -m "add $1"
12 > } 12 > }
223 user: test 223 user: test
224 date: Thu Jan 01 00:00:00 1970 +0000 224 date: Thu Jan 01 00:00:00 1970 +0000
225 summary: add base 225 summary: add base
226 226
227 ============ obsmark ============ 227 ============ obsmark ============
228 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (*) {'user': 'test'} (glob) 228 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (*) {'ef1': '*', 'user': 'test'} (glob)
229 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'user': 'test'} (glob) 229 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '*', 'user': 'test'} (glob)
230 $ hg drop . 230 $ hg drop .
231 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 231 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
232 working directory now at 19509a42b0d0 232 working directory now at 19509a42b0d0
233 search obsmarker: wall * comb * user * sys * (glob) 233 search obsmarker: wall * comb * user * sys * (glob)
234 1 obsmarkers found 234 1 obsmarkers found
261 user: test 261 user: test
262 date: Thu Jan 01 00:00:00 1970 +0000 262 date: Thu Jan 01 00:00:00 1970 +0000
263 summary: add base 263 summary: add base
264 264
265 ============ obsmark ============ 265 ============ obsmark ============
266 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'user': 'test'} (glob) 266 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '0', 'user': 'test'} (glob)