Attachment #151595 for bug #219959

View | Details | Raw Unified | Return to bug 219959
Collapse All | Expand All




/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
/* Header for class org_tigris_subversion_javahl_ConflictDescriptor_Action */

#ifndef _Included_org_tigris_subversion_javahl_ConflictDescriptor_Action
#define _Included_org_tigris_subversion_javahl_ConflictDescriptor_Action
#ifdef __cplusplus
extern "C" {
#endif
#undef org_tigris_subversion_javahl_ConflictDescriptor_Action_edit
#define org_tigris_subversion_javahl_ConflictDescriptor_Action_edit 0L
#undef org_tigris_subversion_javahl_ConflictDescriptor_Action_add
#define org_tigris_subversion_javahl_ConflictDescriptor_Action_add 1L
#undef org_tigris_subversion_javahl_ConflictDescriptor_Action_delete
#define org_tigris_subversion_javahl_ConflictDescriptor_Action_delete 2L
#ifdef __cplusplus
}
#endif
#endif




/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
/* Header for class org_tigris_subversion_javahl_ConflictDescriptor_Kind */

#ifndef _Included_org_tigris_subversion_javahl_ConflictDescriptor_Kind
#define _Included_org_tigris_subversion_javahl_ConflictDescriptor_Kind
#ifdef __cplusplus
extern "C" {
#endif
#undef org_tigris_subversion_javahl_ConflictDescriptor_Kind_text
#define org_tigris_subversion_javahl_ConflictDescriptor_Kind_text 0L
#undef org_tigris_subversion_javahl_ConflictDescriptor_Kind_property
#define org_tigris_subversion_javahl_ConflictDescriptor_Kind_property 1L
#ifdef __cplusplus
}
#endif
#endif




/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
/* Header for class org_tigris_subversion_javahl_ConflictDescriptor_Reason */

#ifndef _Included_org_tigris_subversion_javahl_ConflictDescriptor_Reason
#define _Included_org_tigris_subversion_javahl_ConflictDescriptor_Reason
#ifdef __cplusplus
extern "C" {
#endif
#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_edited
#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_edited 0L
#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_obstructed
#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_obstructed 1L
#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_deleted
#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_deleted 2L
#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_missing
#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_missing 3L
#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_unversioned
#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_unversioned 4L
#ifdef __cplusplus
}
#endif
#endif




        /**
         * Attempting to change text or props.
         */
        public static final int text = 0; // used in native code

        /**
         * Attempting to add object.
         */
        public static final int property = 1; // used in native code
    }

    /**

        /**
         * Attempting to change text or props.
         */
        public static final int edit = 0; // used in native code

        /**
         * Attempting to add object.
         */
        public static final int add = 1; // used in native code

        /**
         * Attempting to delete object.
         */
        public static final int delete = 2; // used in native code
    }

    /**

        /**
         * Local edits are already present.
         */
        public static final int edited = 0; // used in native code

        /**
         * Another object is in the way.
         */
        public static final int obstructed = 1; // used in native code

        /**
         * Object is already schedule-delete.
         */
        public static final int deleted = 2; // used in native code

        /**
         * Object is unknown or missing.
         */
        public static final int missing = 3; // used in native code

        /**
         * Object is unversioned.
         */
        public static final int unversioned = 4; // used in native code
    }
}

Return to bug 219959

Line 0 Link Here

(-)subversion-1.5.0-rc4.orig/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Action.h (+19 lines)
	1	/* DO NOT EDIT THIS FILE - it is machine generated */
	2	#include <jni.h>
	3	/* Header for class org_tigris_subversion_javahl_ConflictDescriptor_Action */
	4
	5	#ifndef _Included_org_tigris_subversion_javahl_ConflictDescriptor_Action
	6	#define _Included_org_tigris_subversion_javahl_ConflictDescriptor_Action
	7	#ifdef __cplusplus
	8	extern "C" {
	9	#endif
	10	#undef org_tigris_subversion_javahl_ConflictDescriptor_Action_edit
	11	#define org_tigris_subversion_javahl_ConflictDescriptor_Action_edit 0L
	12	#undef org_tigris_subversion_javahl_ConflictDescriptor_Action_add
	13	#define org_tigris_subversion_javahl_ConflictDescriptor_Action_add 1L
	14	#undef org_tigris_subversion_javahl_ConflictDescriptor_Action_delete
	15	#define org_tigris_subversion_javahl_ConflictDescriptor_Action_delete 2L
	16	#ifdef __cplusplus
	17	}
	18	#endif
	19	#endif

Lines 171-182 public final class Kind Link Here

(-)subversion-1.5.0-rc4.orig/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java (-10 / +10 lines)
171	/**	171	/**
172	* Attempting to change text or props.	172	* Attempting to change text or props.
173	*/	173	*/
174	public static final int text = 0;	174	public static final int text = 0; // used in native code
175		175
176	/**	176	/**
177	* Attempting to add object.	177	* Attempting to add object.
178	*/	178	*/
179	public static final int property = 1;	179	public static final int property = 1; // used in native code
180	}	180	}
181		181
182	/**	182	/**
Lines 187-203 public final class Action Link Here
187	/**	187	/**
188	* Attempting to change text or props.	188	* Attempting to change text or props.
189	*/	189	*/
190	public static final int edit = 0;	190	public static final int edit = 0; // used in native code
191		191
192	/**	192	/**
193	* Attempting to add object.	193	* Attempting to add object.
194	*/	194	*/
195	public static final int add = 1;	195	public static final int add = 1; // used in native code
196		196
197	/**	197	/**
198	* Attempting to delete object.	198	* Attempting to delete object.
199	*/	199	*/
200	public static final int delete = 2;	200	public static final int delete = 2; // used in native code
201	}	201	}
202		202
203	/**	203	/**
Lines 208-233 public final class Reason Link Here
208	/**	208	/**
209	* Local edits are already present.	209	* Local edits are already present.
210	*/	210	*/
211	public static final int edited = 0;	211	public static final int edited = 0; // used in native code
212		212
213	/**	213	/**
214	* Another object is in the way.	214	* Another object is in the way.
215	*/	215	*/
216	public static final int obstructed = 1;	216	public static final int obstructed = 1; // used in native code
217		217
218	/**	218	/**
219	* Object is already schedule-delete.	219	* Object is already schedule-delete.
220	*/	220	*/
221	public static final int deleted = 2;	221	public static final int deleted = 2; // used in native code
222		222
223	/**	223	/**
224	* Object is unknown or missing.	224	* Object is unknown or missing.
225	*/	225	*/
226	public static final int missing = 3;	226	public static final int missing = 3; // used in native code
227		227
228	/**	228	/**
229	* Object is unversioned.	229	* Object is unversioned.
230	*/	230	*/
231	public static final int unversioned = 4;	231	public static final int unversioned = 4; // used in native code
232	}	232	}
233	}	233	}