Show More
@@ -14,23 +14,14 b' echo "hgext.graphlog =" >> $HGRCPATH' | |||||
14 | svnadmin create svn-repo |
|
14 | svnadmin create svn-repo | |
15 | cat "$TESTDIR/svn/branches.svndump" | svnadmin load svn-repo > /dev/null |
|
15 | cat "$TESTDIR/svn/branches.svndump" | svnadmin load svn-repo > /dev/null | |
16 |
|
16 | |||
17 | svnpath=`pwd | fix_path` |
|
|||
18 | # SVN wants all paths to start with a slash. Unfortunately, |
|
|||
19 | # Windows ones don't. Handle that. |
|
|||
20 | expr $svnpath : "\/" > /dev/null |
|
|||
21 | if [ $? -ne 0 ]; then |
|
|||
22 | svnpath='/'$svnpath |
|
|||
23 | fi |
|
|||
24 | svnurl=file://$svnpath/svn-repo |
|
|||
25 |
|
||||
26 | echo % convert trunk and branches |
|
17 | echo % convert trunk and branches | |
27 | cat >branchmap <<EOF |
|
18 | cat >branchmap <<EOF | |
28 | old3 newbranch |
|
19 | old3 newbranch | |
29 | EOF |
|
20 | EOF | |
30 |
hg convert --branchmap=branchmap --datesort -r 10 |
|
21 | hg convert --branchmap=branchmap --datesort -r 10 svn-repo A-hg | |
31 |
|
22 | |||
32 | echo % convert again |
|
23 | echo % convert again | |
33 |
hg convert --branchmap=branchmap --datesort |
|
24 | hg convert --branchmap=branchmap --datesort svn-repo A-hg | |
34 |
|
25 | |||
35 | cd A-hg |
|
26 | cd A-hg | |
36 | hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n' |
|
27 | hg glog --template 'branch={branches} {rev} {desc|firstline} files: {files}\n' |
@@ -14,15 +14,6 b' echo "hgext.graphlog =" >> $HGRCPATH' | |||||
14 | svnadmin create svn-repo |
|
14 | svnadmin create svn-repo | |
15 | cat "$TESTDIR/svn/startrev.svndump" | svnadmin load svn-repo > /dev/null |
|
15 | cat "$TESTDIR/svn/startrev.svndump" | svnadmin load svn-repo > /dev/null | |
16 |
|
16 | |||
17 | svnpath=`pwd | fix_path` |
|
|||
18 | # SVN wants all paths to start with a slash. Unfortunately, |
|
|||
19 | # Windows ones don't. Handle that. |
|
|||
20 | expr $svnpath : "\/" > /dev/null |
|
|||
21 | if [ $? -ne 0 ]; then |
|
|||
22 | svnpath='/'$svnpath |
|
|||
23 | fi |
|
|||
24 | svnurl=file://$svnpath/svn-repo |
|
|||
25 |
|
||||
26 | convert() |
|
17 | convert() | |
27 | { |
|
18 | { | |
28 | startrev=$1 |
|
19 | startrev=$1 | |
@@ -31,7 +22,7 b' convert()' | |||||
31 | --config convert.svn.trunk=branches/branch1 \ |
|
22 | --config convert.svn.trunk=branches/branch1 \ | |
32 | --config convert.svn.branches=" " \ |
|
23 | --config convert.svn.branches=" " \ | |
33 | --config convert.svn.tags= \ |
|
24 | --config convert.svn.tags= \ | |
34 |
--datesort |
|
25 | --datesort svn-repo $repopath | |
35 | hg -R $repopath glog --template '{rev} {desc|firstline} files: {files}\n' |
|
26 | hg -R $repopath glog --template '{rev} {desc|firstline} files: {files}\n' | |
36 | echo |
|
27 | echo | |
37 | } |
|
28 | } |
@@ -14,17 +14,8 b' echo "hgext.graphlog =" >> $HGRCPATH' | |||||
14 | svnadmin create svn-repo |
|
14 | svnadmin create svn-repo | |
15 | cat "$TESTDIR/svn/tags.svndump" | svnadmin load svn-repo > /dev/null |
|
15 | cat "$TESTDIR/svn/tags.svndump" | svnadmin load svn-repo > /dev/null | |
16 |
|
16 | |||
17 | svnpath=`pwd | fix_path` |
|
|||
18 | # SVN wants all paths to start with a slash. Unfortunately, |
|
|||
19 | # Windows ones don't. Handle that. |
|
|||
20 | expr $svnpath : "\/" > /dev/null |
|
|||
21 | if [ $? -ne 0 ]; then |
|
|||
22 | svnpath='/'$svnpath |
|
|||
23 | fi |
|
|||
24 | svnurl=file://$svnpath/svn-repo |
|
|||
25 |
|
||||
26 | echo % convert |
|
17 | echo % convert | |
27 |
hg convert --datesort |
|
18 | hg convert --datesort svn-repo A-hg | |
28 |
|
19 | |||
29 | cd A-hg |
|
20 | cd A-hg | |
30 | hg glog --template '{rev} {desc|firstline} tags: {tags}\n' |
|
21 | hg glog --template '{rev} {desc|firstline} tags: {tags}\n' | |
@@ -32,6 +23,6 b" hg tags | sed 's/:.*/:/'" | |||||
32 | cd .. |
|
23 | cd .. | |
33 |
|
24 | |||
34 | echo % convert without tags |
|
25 | echo % convert without tags | |
35 |
hg convert --datesort --config convert.svn.tags= |
|
26 | hg convert --datesort --config convert.svn.tags= svn-repo A-notags-hg | |
36 | hg -R A-notags-hg tags -q |
|
27 | hg -R A-notags-hg tags -q | |
37 |
|
28 |
General Comments 0
You need to be logged in to leave comments.
Login now