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