Show More
@@ -316,8 +316,8 b' class mercurial_source(converter_source)' | |||
|
316 | 316 | if name in self.ignored: |
|
317 | 317 | continue |
|
318 | 318 | try: |
|
319 | copysource, copynode = ctx.filectx(name).renamed() | |
|
320 |
if copysource in self.ignored |
|
|
319 | copysource, _copynode = ctx.filectx(name).renamed() | |
|
320 | if copysource in self.ignored: | |
|
321 | 321 | continue |
|
322 | 322 | # Ignore copy sources not in parent revisions |
|
323 | 323 | found = False |
@@ -120,16 +120,26 b' Convert from merge parent' | |||
|
120 | 120 | |
|
121 | 121 | Check copy preservation |
|
122 | 122 | |
|
123 | $ hg st -C --change 2 e | |
|
124 | M e | |
|
125 | $ hg st -C --change 1 e | |
|
126 | A e | |
|
127 | a | |
|
128 | $ hg st -C --change 0 a | |
|
129 | A a | |
|
130 | ||
|
131 | (It seems like a bug in log that the following doesn't show rev 1.) | |
|
132 | ||
|
123 | 133 | $ hg log --follow --copies e |
|
124 |
changeset: 2: |
|
|
134 | changeset: 2:82bbac3d2cf4 | |
|
125 | 135 | user: test |
|
126 | 136 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
127 | 137 | summary: 4: merge 2 and 3 |
|
128 | 138 | |
|
129 |
changeset: |
|
|
139 | changeset: 0:23c3be426dce | |
|
130 | 140 | user: test |
|
131 |
date: Thu Jan 01 00:00:0 |
|
|
132 |
summary: |
|
|
141 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
142 | summary: 1: add c, move f to d | |
|
133 | 143 | |
|
134 | 144 | Check copy removal on missing parent |
|
135 | 145 |
General Comments 0
You need to be logged in to leave comments.
Login now