Alien-SVN

 view release on metacpan or  search on metacpan

src/subversion/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java  view on Meta::CPAN

    }

    public String getBasePath()
    {
        return basePath;
    }

    public String getTheirPath()
    {
        return theirPath;
    }

    public String getMyPath()
    {
        return myPath;
    }

    public String getMergedPath()
    {
        return mergedPath;
    }

    public Operation getOperation()
    {
        return operation;
    }

    public ConflictVersion getSrcLeftVersion()
    {
        return srcLeftVersion;
    }

    public ConflictVersion getSrcRightVersion()
    {
        return srcRightVersion;
    }

    /**
     * Rich man's enum for <code>svn_wc_conflict_kind_t</code>.
     */
    public enum Kind
    {
        /** Attempting to change text or props.  */
        text,

        /** Attempting to add object.  */
        property,

        /** Tree conflict.  */
        tree;
    }

    /**
     * Rich man's enum for <code>svn_wc_conflict_action_t</code>.
     */
    public enum Action
    {
        /**
         * Attempting to change text or props.
         */
        edit,

        /**
         * Attempting to add object.
         */
        add,

        /**
         * Attempting to delete object.
         */
        delete,

        /**
         * Attempting to replace object.
         */
        replace;
    }

    /**
     * Rich man's enum for <code>svn_wc_conflict_reason_t</code>.
     */
    public enum Reason
    {
        /**
         * Local edits are already present.
         */
        edited,

        /**
         * Another object is in the way.
         */
        obstructed,

        /**
         * Object is already schedule-delete.
         */
        deleted,

        /**
         * Object is unknown or missing.
         */
        missing,

        /**
         * Object is unversioned.
         */
        unversioned,

        /**
         * Object is already added or schedule-add.
         * @since 1.6
         */
        added,

        /**
         * Object is already replaced.
         * @since 1.7
         */
        replaced,

        /**
         * Object is moved away.
         * @since 1.8
         */
        moved_away,

        /**
         * Object is moved here.
         * @since 1.8
         */
        moved_here;
    }

    public enum Operation
    {
        /* none */
        none,

        /* update */
        update,

        /* switch */
        /* Note: this is different that svn_wc.h, because 'switch' is a
        * reserved word in java  :(  */
        switched,

        /* merge */



( run in 0.339 second using v1.01-cache-2.11-cpan-411bb0df24b )