comparison tests/test-obsolete.t @ 3593:b92114f201c9 mercurial-4.1

test-compat: merge mercurial-4.2 into mercurial-4.1
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 21 Mar 2018 16:35:18 +0100
parents 7a5c3175015e b21a3753255f
children
comparison
equal deleted inserted replaced
3592:7a5c3175015e 3593:b92114f201c9
8 > publish=False 8 > publish=False
9 > [alias] 9 > [alias]
10 > debugobsolete=debugobsolete -d '0 0' 10 > debugobsolete=debugobsolete -d '0 0'
11 > [extensions] 11 > [extensions]
12 > hgext.rebase= 12 > hgext.rebase=
13 > color =
13 > EOF 14 > EOF
14 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH 15 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
15 $ mkcommit() { 16 $ mkcommit() {
16 > echo "$1" > "$1" 17 > echo "$1" > "$1"
17 > hg add "$1" 18 > hg add "$1"
272 adding changesets 273 adding changesets
273 adding manifests 274 adding manifests
274 adding file changes 275 adding file changes
275 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 276 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
276 1 new obsolescence markers 277 1 new obsolescence markers
277 (run 'hg heads' to see heads, 'hg merge' to merge) 278 (run 'hg heads .' to see heads, 'hg merge' to merge)
278 $ qlog -R ../other-new 279 $ qlog -R ../other-new
279 6 280 6
280 - 909a0fb57e5d 281 - 909a0fb57e5d
281 3 282 3
282 - 725c380fe99b 283 - 725c380fe99b
362 adding changesets 363 adding changesets
363 adding manifests 364 adding manifests
364 adding file changes 365 adding file changes
365 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 366 added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
366 1 new obsolescence markers 367 1 new obsolescence markers
367 (run 'hg heads' to see heads, 'hg merge' to merge) 368 (run 'hg heads .' to see heads, 'hg merge' to merge)
368 369
369 $ hg up -q 7 # to check rollback update behavior 370 $ hg up -q 7 # to check rollback update behavior
370 $ qlog 371 $ qlog
371 7 372 7
372 - 159dfc9fa5d3 373 - 159dfc9fa5d3