Source for file Resolved.php
Documentation is available at Resolved.php
/* vim: set expandtab tabstop=4 shiftwidth=4: */
* +----------------------------------------------------------------------+
* | This LICENSE is in the BSD license style. |
* | http://www.opensource.org/licenses/bsd-license.php |
* | Redistribution and use in source and binary forms, with or without |
* | modification, are permitted provided that the following conditions |
* | * Redistributions of source code must retain the above copyright |
* | notice, this list of conditions and the following disclaimer. |
* | * Redistributions in binary form must reproduce the above |
* | copyright notice, this list of conditions and the following |
* | disclaimer in the documentation and/or other materials provided |
* | with the distribution. |
* | * Neither the name of Clay Loveless nor the names of contributors |
* | may be used to endorse or promote products derived from this |
* | software without specific prior written permission. |
* | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
* | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
* | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
* | FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
* | COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
* | INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
* | BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
* | LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
* | CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
* | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
* | ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
* | POSSIBILITY OF SUCH DAMAGE. |
* +----------------------------------------------------------------------+
* @category VersionControl
* @package VersionControl_SVN
* @author Clay Loveless <clay@killersoft.com>
* @author Alexander Opitz <opitz.alexander@gmail.com>
* @copyright 2004-2007 Clay Loveless
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @link http://pear.php.net/package/VersionControl_SVN
require_once 'VersionControl/SVN/Command.php';
* Subversion Resolved command manager class
* Remove "conflicted" state on working copy files or directories.
* Note: This subcommand does not semantically resolve conflicts or
* remove conflict markers; it merely removes the conflict-related
* artifact files and allows PATH to be committed again.
* $switches is an array containing one or more command line options
* defined by the following associative keys:
* // pass contents of file ARG as additional args
* 'recursive' => true|false,
* 'q [quiet]' => true|false,
* // prints as little as possible
* 'config-dir' => 'Path to a Subversion configuration directory'
* Note: Subversion does not offer an XML output option for this subcommand
* The non-interactive option available on the command-line
* svn client may also be set (true|false), but it is set to true by default.
* require_once 'VersionControl/SVN.php';
* // Set up runtime options. Will be passed to all
* $options = array('fetchmode' => VERSIONCONTROL_SVN_FETCHMODE_RAW);
* // Pass array of subcommands we need to factory
* $svn = VersionControl_SVN::factory(array('resolved'), $options);
* // Define any switches and aguments we may need
* $switches = array('R' => true);
* $args = array('/path/to/working/copy/TestProj/trunk');
* print_r($svn->resolved->run($args, $switches));
* } catch (VersionControl_SVN_Exception $e) {
* print_r($e->getMessage());
* @category VersionControl
* @package VersionControl_SVN
* @author Clay Loveless <clay@killersoft.com>
* @author Alexander Opitz <opitz.alexander@gmail.com>
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
* @link http://pear.php.net/package/VersionControl_SVN
* Minimum number of args required by this subcommand.
* See {@link http://svnbook.red-bean.com/svnbook/ Version Control with Subversion},
* Subversion Complete Reference for details on arguments for this subcommand.
* Constuctor of command. Adds available switches.
Documentation generated on Sat, 09 Feb 2013 12:30:12 +0000 by phpDocumentor 1.4.3. PEAR Logo Copyright © PHP Group 2004.
|