submerge
by Aaron Suggs
http://ktheory.com/
== DESCRIPTION:
Submerge make it easy to perform common merge tasks when working with trunk
and branches in the subversion SCM.
Submerge requires that your present working directory is a subversion
checkout in order to compute the svn URL of your current checkout.
submerge assumes that your project follows the convention of keeping the
latest changes in
your-svn-project-url/trunk
and branches in
your-svn-project-url/branches/your-branch-name
and moreover that release branches are named like "RB-/\d+(\.\d+)*/";
e.g. the release 1.0 branch would have the URL
your-svn-project-url/branches/RB-1.0
== FEATURES/PROBLEMS:
== SYNOPSIS:
$ submerge [CHANGESET...] [-b BRANCH]
CHANGESET may either be a single number, like "2", or a range changesets,
like "M:N" where M and N are numbers. If no CHANGESET is specified, defaults
to a single number HEAD. If M or N is not specified in range form, they
default to HEAD.
So the following are equivalent:
submerge
submerge HEAD
and
submerge 2:
submerge 2:HEAD
and
submerge :999
submerge HEAD:999
If BRANCH is not set, defaults to:
* latest release branch if pwd is a trunk checkout
* trunk otherwise
The -u or --undor option may be used for in
== REQUIREMENTS:
== INSTALL:
gem install submerge
== LICENSE:
(The MIT License)
Copyright (c) 2007 FIX
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
by Aaron Suggs
http://ktheory.com/
== DESCRIPTION:
Submerge make it easy to perform common merge tasks when working with trunk
and branches in the subversion SCM.
Submerge requires that your present working directory is a subversion
checkout in order to compute the svn URL of your current checkout.
submerge assumes that your project follows the convention of keeping the
latest changes in
your-svn-project-url/trunk
and branches in
your-svn-project-url/branches/your-branch-name
and moreover that release branches are named like "RB-/\d+(\.\d+)*/";
e.g. the release 1.0 branch would have the URL
your-svn-project-url/branches/RB-1.0
== FEATURES/PROBLEMS:
== SYNOPSIS:
$ submerge [CHANGESET...] [-b BRANCH]
CHANGESET may either be a single number, like "2", or a range changesets,
like "M:N" where M and N are numbers. If no CHANGESET is specified, defaults
to a single number HEAD. If M or N is not specified in range form, they
default to HEAD.
So the following are equivalent:
submerge
submerge HEAD
and
submerge 2:
submerge 2:HEAD
and
submerge :999
submerge HEAD:999
If BRANCH is not set, defaults to:
* latest release branch if pwd is a trunk checkout
* trunk otherwise
The -u or --undor option may be used for in
== REQUIREMENTS:
== INSTALL:
gem install submerge
== LICENSE:
(The MIT License)
Copyright (c) 2007 FIX
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.