# BEGIN BPS TAGGED BLOCK {{{ # COPYRIGHT: # # This software is Copyright (c) 2003-2006 Best Practical Solutions, LLC # <clkao@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) # # # LICENSE: # # # This program is free software; you can redistribute it and/or # modify it under the terms of either: # # a) Version 2 of the GNU General Public License. You should have # received a copy of the GNU General Public License along with this # program. If not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 or visit # their web page on the internet at # http://www.gnu.org/copyleft/gpl.html. # # b) Version 1 of Perl's "Artistic License". You should have received # a copy of the Artistic License with this package, in the file # named "ARTISTIC". The license is also available at # http://opensource.org/licenses/artistic-license.php. # # This work is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # CONTRIBUTION SUBMISSION POLICY: # # (The following paragraph is not intended to limit the rights granted # to you to modify and distribute this software under the terms of the # GNU General Public License and is only of importance to you if you # choose to contribute your changes and enhancements to the community # by submitting them to Best Practical Solutions, LLC.) # # By intentionally submitting any modifications, corrections or # derivatives to this work, or any other work intended for use with SVK, # to Best Practical Solutions, LLC, you confirm that you are the # copyright holder for those contributions and you grant Best Practical # Solutions, LLC a nonexclusive, worldwide, irrevocable, royalty-free, # perpetual, license to use, copy, create derivative works based on # those contributions, and sublicense and distribute those contributions # and any derivatives thereof. # # END BPS TAGGED BLOCK }}} package SVK::Command::Smerge; use strict; use SVK::Version; our $VERSION = $SVK::VERSION; use base qw( SVK::Command::Merge ); use SVK::XD; use SVK::Logger; sub options { ($_[0]->SUPER::options, 'B|baseless' => 'baseless', 'b|base=s' => 'merge_base', 'baserev=i' => 'rev', ); } sub run { my ($self, @arg) = @_; $self->{auto}++; if ($self->{baserev}) { $logger->warn(loc("--baserev is deprecated, use --base instead")); $self->{base} ||= $self->{baserev}; } $self->SUPER::run (@arg); } 1; __DATA__ =head1 NAME SVK::Command::Smerge - Automatically merge all changes between branches =head1 SYNOPSIS smerge DEPOTPATH [PATH] smerge DEPOTPATH1 DEPOTPATH2 smerge [--to|--from] [PATH] =head1 OPTIONS -I [--incremental] : apply each change individually -l [--log] : use logs of merged revisions as commit message -B [--baseless] : use the earliest revision as the merge point -b [--base] BASE : use BASE as the merge base, which can be PATH:REV -s [--sync] : synchronize mirrored sources before update -t [--to] : merge to the specified path -f [--from] : merge from the specified path --verbatim : verbatim merge log without indents and header --no-ticket : do not record this merge point --track-rename : track changes made to renamed node --host HOST : use HOST as the hostname shown in merge log --remoterev : use remote revision numbers in merge log -m [--message] MESSAGE : specify commit message MESSAGE -F [--file] FILENAME : read commit message from FILENAME --template : use the specified message as the template to edit --encoding ENC : treat -m/-F value as being in charset encoding ENC -P [--patch] NAME : instead of commit, save this change as a patch -S [--sign] : sign this change -C [--check-only] : try operation but make no changes --direct : commit directly even if the path is mirrored