equal
deleted
inserted
replaced
1208 crev = manifest2[cfname] |
1208 crev = manifest2[cfname] |
1209 newfparent = fparent1 |
1209 newfparent = fparent1 |
1210 |
1210 |
1211 # Here, we used to search backwards through history to try to find |
1211 # Here, we used to search backwards through history to try to find |
1212 # where the file copy came from if the source of a copy was not in |
1212 # where the file copy came from if the source of a copy was not in |
1213 # the parent diretory. However, this doesn't actually make sense to |
1213 # the parent directory. However, this doesn't actually make sense to |
1214 # do (what does a copy from something not in your working copy even |
1214 # do (what does a copy from something not in your working copy even |
1215 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn |
1215 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn |
1216 # the user that copy information was dropped, so if they didn't |
1216 # the user that copy information was dropped, so if they didn't |
1217 # expect this outcome it can be fixed, but this is the correct |
1217 # expect this outcome it can be fixed, but this is the correct |
1218 # behavior in this circumstance. |
1218 # behavior in this circumstance. |