##// END OF EJS Templates
Test darcs converter
Patrick Mezard -
r5413:719fd175 default
parent child Browse files
Show More
@@ -0,0 +1,52 b''
1 #!/bin/sh
2
3 "$TESTDIR/hghave" darcs || exit 80
4
5 echo "[extensions]" >> $HGRCPATH
6 echo "convert=" >> $HGRCPATH
7 echo 'hgext.graphlog =' >> $HGRCPATH
8
9 DARCS_EMAIL='test@example.org'; export DARCS_EMAIL
10
11 echo % initialize darcs repo
12 mkdir darcs-repo
13 cd darcs-repo
14 darcs init
15 echo a > a
16 darcs record -a -l -m p0
17 cd ..
18
19 echo % branch and update
20 darcs get darcs-repo darcs-clone
21 cd darcs-clone
22 echo c >> a
23 echo c > c
24 darcs record -a -l -m p1.1
25 cd ..
26
27 echo % update source
28 cd darcs-repo
29 echo b >> a
30 echo b > b
31 darcs record -a -l -m p1.2
32
33 echo % merge branch
34 darcs pull -a ../darcs-clone
35 echo e > a
36 darcs record -a -l -m p2
37 cd ..
38
39 glog()
40 {
41 hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
42 }
43
44 hg convert darcs-repo darcs-repo-hg
45 # The converter does not currently handle patch conflicts very well.
46 # When they occur, it reverts *all* changes and moves forward,
47 # letting the conflict resolving patch fix collisions.
48 # Unfortunately, non-conflicting changes, like the addition of the
49 # "c" file in p1.1 patch are reverted too.
50 # Just to say that manifest not listing "c" here is a bug.
51 glog -R darcs-repo-hg
52 hg -R darcs-repo-hg manifest --debug
@@ -0,0 +1,31 b''
1 % initialize darcs repo
2 Finished recording patch 'p0'
3 % branch and update
4 Copying patch 1 of 1... Copying patch 1 of 1... done.
5 Finished getting.
6 Finished recording patch 'p1.1'
7 % update source
8 Finished recording patch 'p1.2'
9 % merge branch
10 We have conflicts in the following files:
11 ./a
12 Finished pulling and applying.
13 Finished recording patch 'p2'
14 initializing destination darcs-repo-hg repository
15 scanning source...
16 sorting...
17 converting...
18 3 p0
19 2 p1.2
20 1 p1.1
21 0 p2
22 o 3 "p2" files: a
23 |
24 o 2 "p1.1" files:
25 |
26 o 1 "p1.2" files: a b
27 |
28 o 0 "p0" files: a
29
30 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a
31 1e88685f5ddec574a34c70af492f95b6debc8741 644 b
General Comments 0
You need to be logged in to leave comments. Login now