Show More
@@ -116,7 +116,8 b' class darcs_source(converter_source, com' | |||||
116 | continue |
|
116 | continue | |
117 | if elt.tag == 'move': |
|
117 | if elt.tag == 'move': | |
118 | changes.append((elt.get('from'), rev)) |
|
118 | changes.append((elt.get('from'), rev)) | |
119 |
c |
|
119 | changes.append((elt.get('to'), rev)) | |
|
120 | copies[elt.get('to')] = elt.get('from') | |||
120 | else: |
|
121 | else: | |
121 | changes.append((elt.text.strip(), rev)) |
|
122 | changes.append((elt.text.strip(), rev)) | |
122 | self.lastrev = rev |
|
123 | self.lastrev = rev |
@@ -43,7 +43,12 b' echo % merge branch' | |||||
43 | darcs pull -a ../darcs-clone |
|
43 | darcs pull -a ../darcs-clone | |
44 | sleep 1 |
|
44 | sleep 1 | |
45 | echo e > a |
|
45 | echo e > a | |
|
46 | echo f > f | |||
46 | darcs record -a -l -m p2 |
|
47 | darcs record -a -l -m p2 | |
|
48 | ||||
|
49 | echo % test file and directory move | |||
|
50 | darcs mv f ff | |||
|
51 | darcs record -a -l -m p3 | |||
47 | cd .. |
|
52 | cd .. | |
48 |
|
53 | |||
49 | glog() |
|
54 | glog() |
@@ -10,15 +10,20 b' We have conflicts in the following files' | |||||
10 | ./a |
|
10 | ./a | |
11 | Finished pulling and applying. |
|
11 | Finished pulling and applying. | |
12 | Finished recording patch 'p2' |
|
12 | Finished recording patch 'p2' | |
|
13 | % test file and directory move | |||
|
14 | Finished recording patch 'p3' | |||
13 | initializing destination darcs-repo-hg repository |
|
15 | initializing destination darcs-repo-hg repository | |
14 | scanning source... |
|
16 | scanning source... | |
15 | sorting... |
|
17 | sorting... | |
16 | converting... |
|
18 | converting... | |
17 |
|
|
19 | 4 p0 | |
18 |
|
|
20 | 3 p1.2 | |
19 |
|
|
21 | 2 p1.1 | |
20 |
|
|
22 | 1 p2 | |
21 | o 3 "p2" files: a |
|
23 | 0 p3 | |
|
24 | o 4 "p3" files: f ff | |||
|
25 | | | |||
|
26 | o 3 "p2" files: a f | |||
22 | | |
|
27 | | | |
23 | o 2 "p1.1" files: |
|
28 | o 2 "p1.1" files: | |
24 | | |
|
29 | | | |
@@ -28,3 +33,4 b' o 0 "p0" files: a' | |||||
28 |
|
33 | |||
29 | 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a |
|
34 | 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a | |
30 | 1e88685f5ddec574a34c70af492f95b6debc8741 644 b |
|
35 | 1e88685f5ddec574a34c70af492f95b6debc8741 644 b | |
|
36 | ef5c76581d78340f568d5f48d679bf307452cbc9 644 ff |
General Comments 0
You need to be logged in to leave comments.
Login now