Mercurial > hg
comparison tests/test-convert-svn-branches.t @ 20306:fe8e254c7ad6 stable
merge default into stable for 2.9 code freeze
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 21 Jan 2014 14:30:06 -0600 |
parents | aa9385f983fa |
children | 1d155582a8ea |
comparison
equal
deleted
inserted
replaced
20213:8c69c69dbcd2 | 20306:fe8e254c7ad6 |
---|---|
2 $ "$TESTDIR/hghave" svn svn-bindings || exit 80 | 2 $ "$TESTDIR/hghave" svn svn-bindings || exit 80 |
3 | 3 |
4 $ cat >> $HGRCPATH <<EOF | 4 $ cat >> $HGRCPATH <<EOF |
5 > [extensions] | 5 > [extensions] |
6 > convert = | 6 > convert = |
7 > graphlog = | |
8 > EOF | 7 > EOF |
9 | 8 |
10 $ svnadmin create svn-repo | 9 $ svnadmin create svn-repo |
11 $ svnadmin load -q svn-repo < "$TESTDIR/svn/branches.svndump" | 10 $ svnadmin load -q svn-repo < "$TESTDIR/svn/branches.svndump" |
12 | 11 |
56 sorting... | 55 sorting... |
57 converting... | 56 converting... |
58 0 branch trunk@1 into old3 | 57 0 branch trunk@1 into old3 |
59 | 58 |
60 $ cd A-hg | 59 $ cd A-hg |
61 $ hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n' | 60 $ hg log -G --template 'branch={branches} {rev} {desc|firstline} files: {files}\n' |
62 o branch=newbranch 11 branch trunk@1 into old3 files: | 61 o branch=newbranch 11 branch trunk@1 into old3 files: |
63 | | 62 | |
64 | o branch= 10 last change to a files: a | 63 | o branch= 10 last change to a files: a |
65 | | | 64 | | |
66 | | o branch=old 9 move back to old files: | 65 | | o branch=old 9 move back to old files: |