Mercurial > hg

comparison tests/test-rebase-mq-skip.t @ 26916:c7931d8ea29c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: explicitly use generaldelta in 'test-rebase-mq-skip.t' This induces some trivial changes in the tests. This happen in its own changeset for clarity purposes.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sun, 18 Oct 2015 18:36:39 +0200
parents 143b52fce68e
children 157675d0f600
comparison
equal deleted inserted replaced
26915:d92993d6210c 26916:c7931d8ea29c
1 This emulates the effects of an hg pull --rebase in which the remote repo 1 This emulates the effects of an hg pull --rebase in which the remote repo
2 already has one local mq patch 2 already has one local mq patch
3 3
4 $ cat >> $HGRCPATH <<EOF 4 $ cat >> $HGRCPATH <<EOF
5 > [format]
6 > usegeneraldelta=yes
5 > [extensions] 7 > [extensions]
6 > rebase= 8 > rebase=
7 > mq= 9 > mq=
8 > 10 >
9 > [phases] 11 > [phases]
66 rebase merging completed 68 rebase merging completed
67 updating mq patch p0.patch to 5:9ecc820b1737 69 updating mq patch p0.patch to 5:9ecc820b1737
68 $TESTTMP/a/.hg/patches/p0.patch (glob) 70 $TESTTMP/a/.hg/patches/p0.patch (glob)
69 2 changesets found 71 2 changesets found
70 uncompressed size of bundle content: 72 uncompressed size of bundle content:
71 344 (changelog) 73 384 (changelog)
72 284 (manifests) 74 324 (manifests)
73 109 p0 75 129 p0
74 109 p1 76 129 p1
75 saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-backup.hg (glob) 77 saved backup bundle to $TESTTMP/a/.hg/strip-backup/13a46ce44f60-5da6ecfb-backup.hg (glob)
76 2 changesets found 78 2 changesets found
77 uncompressed size of bundle content: 79 uncompressed size of bundle content:
78 399 (changelog) 80 439 (changelog)
79 284 (manifests) 81 324 (manifests)
80 109 p0 82 129 p0
81 109 p1 83 129 p1
82 adding branch 84 adding branch
83 adding changesets 85 adding changesets
84 adding manifests 86 adding manifests
85 adding file changes 87 adding file changes
86 added 2 changesets with 2 changes to 2 files 88 added 2 changesets with 2 changes to 2 files