comparison tests/test-sharing.t @ 2110:f1ffd093ef30 mercurial-3.9

mercurial-3.9: merge with hg-4.0 branch We merge with the code for the future evolve 6.0.0 code to check for compatibility. Only minor test output change (" -> ') have been noted.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 14 Mar 2017 14:47:20 -0700
parents 343298df3f26 9f42f819267b
children 3e339f6717c7
comparison
equal deleted inserted replaced
1816:bb665c99562a 2110:f1ffd093ef30
7 > [alias] 7 > [alias]
8 > shortlog = log --template '{rev}:{node|short} {phase} {desc|firstline}\n' 8 > shortlog = log --template '{rev}:{node|short} {phase} {desc|firstline}\n'
9 > [extensions] 9 > [extensions]
10 > rebase = 10 > rebase =
11 > EOF 11 > EOF
12 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH 12 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
13 $ hg init public 13 $ hg init public
14 $ hg clone public test-repo 14 $ hg clone public test-repo
15 updating to branch default 15 updating to branch default
16 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 16 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17 $ hg clone test-repo dev-repo 17 $ hg clone test-repo dev-repo