相关疑难解决方法(0)

我用命令生成了一个diff.txt文件(从〜执行):

diff -r /full/path/to/directory/A /full/path/to/directory/B > diff.txt

生成的diff文件看起来不错.

现在我跑(总是从〜)

patch -p0 <diff.txt

或者我也尝试过:

patch <diff.txt

我希望它将更改应用于/ full/path/to/directory/A中的文件,以便在操作之后它们将与/ full/path/to/directory/B中的文件相同.

但它只说: *补丁输入中只发现垃圾.

我错过了什么？

编辑:这是整个差异文件:

diff /media/DATA/lavoro/eclipse_workspace/ODK Collect/src/net/xxx/collect/android/activities/FormEntryActivity.java /media/DATA/lavoro/xxx/backups/odk src embedded maps/net/xxx/collect/android/activities/FormEntryActivity.java
21a22,27
> 
> import com.google.android.maps.GeoPoint;
> import com.google.android.maps.MapActivity;
> import com.google.android.maps.MapView;
> import com.google.android.maps.MyLocationOverlay;
> 
36a43
> import net.xxx.collect.android.widgets.GeoPointWidget;
50a58,60
> import android.location.Location;
> import android.location.LocationListener;
> import android.location.LocationManager;
86a97
> import java.util.List;
96,97c107,108
< public class FormEntryActivity extends Activity implements AnimationListener, FormLoaderListener,
<         FormSavedListener, AdvanceToNextListener, OnGestureListener {
---
> …