Svnmerge.py - Revision history

Giovannibajo: /* Downloads */ removed references to windows build which doesn’t exist anymore

2023-08-02T16:29:32Z

Downloads: removed references to windows build which doesn’t exist anymore

← Older revision		Revision as of 09:29, 2 August 2023
Line 56:		Line 56:
	\|[http://svn.apache.org/repos/asf/subversion/branches/1.4.x/contrib/client-side/svnmerge.py svnmerge.py 1.4-branch version]		\|[http://svn.apache.org/repos/asf/subversion/branches/1.4.x/contrib/client-side/svnmerge.py svnmerge.py 1.4-branch version]
	\|\| This is the version shipped with SVN 1.4. It's less updated than the trunk version so it will usually have less features but maybe be a little more stable. Get this if the current trunk version is temporarily broken.		\|\| This is the version shipped with SVN 1.4. It's less updated than the trunk version so it will usually have less features but maybe be a little more stable. Get this if the current trunk version is temporarily broken.
	\|-
	\|<span id="Windows_executable"></span>[http://www.develer.com/~rasky/svnmerge.exe svnmerge.exe Windows executable] \|\| Self-contained Windows executable, does not require a Python installation (but still requires SVN command line client). This is updated every once in a while, use <tt>--version</tt> to compare it with the trunk version. Ask [mailto:rasky@develer.com Giovanni Bajo] if you need a newer version.
	\|-		\|-
	\|[http://svnmergegui.googlecode.com/ SvnMergeGui] \|\| Windows GUI front-end application to svnmerge.exe		\|[http://svnmergegui.googlecode.com/ SvnMergeGui] \|\| Windows GUI front-end application to svnmerge.exe

Biewers: /* Fix 'analysys' spelling to 'analysis' */

2011-03-16T16:03:13Z

Fix 'analysys' spelling to 'analysis'

← Older revision		Revision as of 09:03, 16 March 2011
Line 176:		Line 176:
	</pre>		</pre>
	</li>		</li>
	<li>If you just want to merge the ''whole'' branch into the trunk, you can simply do:<pre>$ svnmerge.py merge --bidirectional</pre>This command might report an error and tell you to use the <tt>-S</tt> (aka <tt>--head</tt>) option to disambiguate; this happens if you are tracking several branches at the same time in the trunk. In that case, just use something like: <pre>$ svnmerge.py merge --bidirectional -S BRANCH_NAME</pre>where <tt>BRANCH_NAME</tt> is a string useful to disambiguate (or the full URL if you prefer).<br/><tt>--bidirectional</tt> is useful if the branch is managed with svnmerge.py as well: in fact, it tells svnmerge.py to perform an additional ~~analysys~~ to automatically ignore changes in the branch which are just merges from the trunk itself (so-called ''reflected'' revisions).		<li>If you just want to merge the ''whole'' branch into the trunk, you can simply do:<pre>$ svnmerge.py merge --bidirectional</pre>This command might report an error and tell you to use the <tt>-S</tt> (aka <tt>--head</tt>) option to disambiguate; this happens if you are tracking several branches at the same time in the trunk. In that case, just use something like: <pre>$ svnmerge.py merge --bidirectional -S BRANCH_NAME</pre>where <tt>BRANCH_NAME</tt> is a string useful to disambiguate (or the full URL if you prefer).<br/><tt>--bidirectional</tt> is useful if the branch is managed with svnmerge.py as well: in fact, it tells svnmerge.py to perform an additional analysis to automatically ignore changes in the branch which are just merges from the trunk itself (so-called ''reflected'' revisions).
	<li>If you want to cherry-pick some changes (or just merge some revision ranges), you can follow the same advice as in the section [[#Release branches\|Release branches]]. Make sure to always use <tt>--bidirectional</tt> to all <tt>avail</tt> and <tt>merge</tt> command you issue to ignore reflected revisions.</li>		<li>If you want to cherry-pick some changes (or just merge some revision ranges), you can follow the same advice as in the section [[#Release branches\|Release branches]]. Make sure to always use <tt>--bidirectional</tt> to all <tt>avail</tt> and <tt>merge</tt> command you issue to ignore reflected revisions.</li>
	<li>When you are done with the branch and you want to close it, you can uninitialize merge support from the trunk:<pre>$ svnmerge.py uninit -S BRANCH_NAME</pre>. This is useful because it keeps the house clean, reduces the number of available branches for merge, and keep the need of using the <tt>-S</tt> option at the bare minimum.</li>		<li>When you are done with the branch and you want to close it, you can uninitialize merge support from the trunk:<pre>$ svnmerge.py uninit -S BRANCH_NAME</pre>. This is useful because it keeps the house clean, reduces the number of available branches for merge, and keep the need of using the <tt>-S</tt> option at the bare minimum.</li>

谢继雷: You can run merge everywhere.

2010-12-30T08:21:26Z

You can run merge everywhere.

← Older revision		Revision as of 01:21, 30 December 2010
Line 107:		Line 107:
	Or use your favourite commit message.		Or use your favourite commit message.
	* It's time to do a merge. To merge everything from the trunk into the branch, chdir to the top-level of the branch, and it's sufficient to do:		* It's time to do a merge. To merge everything from the trunk into the branch, chdir to the top-level of the branch, and it's sufficient to do:
	<pre>$ svnmerge.py merge</pre>		<pre>foo/branch1/$ svnmerge.py merge</pre>
	and that's it! Then, review the merge, fix any eventual conflict, and commit. There is a handy commit message listing the logs of all the merged revisions (can be quite long), which many people find useful.		or, without chdir:
			<pre>foo/$ svnmerge.py merge branch1</pre>
			and that's it! You will always get the ''svnmerge-commit-message.txt'' in the current directory. Then, review the merge, fix any eventual conflict, and commit. There is a handy commit message listing the logs of all the merged revisions (can be quite long), which many people find useful.
	* According to the svn repository, it may be necessary to nav into the directory above the working copy of the branch then name the branch in the svnmerge merge command, so the sequence of init tracking -> merge would be for instance		* According to the svn repository, it may be necessary to nav into the directory above the working copy of the branch then name the branch in the svnmerge merge command, so the sequence of init tracking -> merge would be for instance
	<pre>/path/to/dir/myworkingcopy$ svnmerge.py init		<pre>/path/to/dir/myworkingcopy$ svnmerge.py init

谢继雷: run svnmerge.py with-in the top-level directory of the branch.

2010-12-30T08:11:25Z

run svnmerge.py with-in the top-level directory of the branch.

← Older revision		Revision as of 01:11, 30 December 2010
Line 101:		Line 101:
	* Initialize merge tracking support:		* Initialize merge tracking support:
	<pre>$ svnmerge.py init</pre>		<pre>$ svnmerge.py init</pre>
	This command will scan the branch history to find out when the branch was created, so to initialize merge tracking support. This needs to be done only once for each branch you want to use svnmerge.py on.		This command will scan the branch history to find out when the branch was created, so to initialize merge tracking support. This needs to be done only once for each branch you want to use svnmerge.py on. You should run this command with-in the top-level directory of the branch, otherwise it won't work as expected.
	* The ''svnmerge.py init'' command added a property to the top level directory. Since svnmerge.py never does a commit, it's your turn to commit that change to the repository. You can use the handy automatically generated file:		* The ''svnmerge.py init'' command added a property to the top level directory. Since svnmerge.py never does a commit, it's your turn to commit that change to the repository. You can use the handy automatically generated file:
	<pre>$ svn ci -F svnmerge-commit-message.txt		<pre>$ svn ci -F svnmerge-commit-message.txt
	$ rm svnmerge-commit-message.txt</pre>		$ rm svnmerge-commit-message.txt</pre>
	Or use your favourite commit message.		Or use your favourite commit message.
	* It's time to do a merge. To merge everything from the trunk into the branch, it's sufficient to do:		* It's time to do a merge. To merge everything from the trunk into the branch, chdir to the top-level of the branch, and it's sufficient to do:
	<pre>$ svnmerge.py merge</pre>		<pre>$ svnmerge.py merge</pre>
	and that's it! Then, review the merge, fix any eventual conflict, and commit. There is a handy commit message listing the logs of all the merged revisions (can be quite long), which many people find useful.		and that's it! Then, review the merge, fix any eventual conflict, and commit. There is a handy commit message listing the logs of all the merged revisions (can be quite long), which many people find useful.

Haypo: /* Downloads */ update urls to the new Apache respository

2010-03-21T21:37:34Z

Downloads: update urls to the new Apache respository

← Older revision		Revision as of 14:37, 21 March 2010
Line 52:		Line 52:
	!Description		!Description
	\|-		\|-
	\|[http://svn.~~collab~~.~~net~~/repos/~~svn~~/trunk/contrib/client-side/svnmerge/svnmerge.py svnmerge.py trunk version] \|\| This is the default development version, which is usually very stable. Get it without worrying too much!		\|[http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/svnmerge/svnmerge.py svnmerge.py trunk version] \|\| This is the default development version, which is usually very stable. Get it without worrying too much!
	\|-		\|-
	\|[http://svn.~~collab~~.~~net~~/repos/~~svn~~/branches/1.4.x/contrib/client-side/svnmerge.py svnmerge.py 1.4-branch version]		\|[http://svn.apache.org/repos/asf/subversion/branches/1.4.x/contrib/client-side/svnmerge.py svnmerge.py 1.4-branch version]
	\|\| This is the version shipped with SVN 1.4. It's less updated than the trunk version so it will usually have less features but maybe be a little more stable. Get this if the current trunk version is temporarily broken.		\|\| This is the version shipped with SVN 1.4. It's less updated than the trunk version so it will usually have less features but maybe be a little more stable. Get this if the current trunk version is temporarily broken.
	\|-		\|-

WikiSysop: Reverted edits by MitchellAdams (Talk) to last revision by Aaronoliver

2010-03-05T05:18:56Z

Reverted edits by MitchellAdams (Talk) to last revision by Aaronoliver

← Older revision		Revision as of 22:18, 4 March 2010
Line 14:		Line 14:
	* '''Bidirectional merges''': merges changes forth and back between a branch and its head.		* '''Bidirectional merges''': merges changes forth and back between a branch and its head.
	* '''Multiple heads support''': merge changes from multiple sources. This is useful, for instance, for the trunk, which usually needs to merge changes from multiple branches.		* '''Multiple heads support''': merge changes from multiple sources. This is useful, for instance, for the trunk, which usually needs to merge changes from multiple branches.
	* [http://www.essayontime.com/services/essay.html essay writer]
	* '''Revision blocking''': mark some revisions as unwanted in the branch, so that they will never get merged and you can forget about them.		* '''Revision blocking''': mark some revisions as unwanted in the branch, so that they will never get merged and you can forget about them.
	* '''Merge rollbacks''': freely revert merges in case you changed your mind.		* '''Merge rollbacks''': freely revert merges in case you changed your mind.

MitchellAdams at 19:32, 4 March 2010

2010-03-04T19:32:18Z

← Older revision		Revision as of 12:32, 4 March 2010
Line 14:		Line 14:
	* '''Bidirectional merges''': merges changes forth and back between a branch and its head.		* '''Bidirectional merges''': merges changes forth and back between a branch and its head.
	* '''Multiple heads support''': merge changes from multiple sources. This is useful, for instance, for the trunk, which usually needs to merge changes from multiple branches.		* '''Multiple heads support''': merge changes from multiple sources. This is useful, for instance, for the trunk, which usually needs to merge changes from multiple branches.
			* [http://www.essayontime.com/services/essay.html essay writer]
	* '''Revision blocking''': mark some revisions as unwanted in the branch, so that they will never get merged and you can forget about them.		* '''Revision blocking''': mark some revisions as unwanted in the branch, so that they will never get merged and you can forget about them.
	* '''Merge rollbacks''': freely revert merges in case you changed your mind.		* '''Merge rollbacks''': freely revert merges in case you changed your mind.

Aaronoliver: took out reference to rel notes from a year ago

2009-09-02T13:30:15Z

took out reference to rel notes from a year ago

← Older revision		Revision as of 06:30, 2 September 2009
Line 1:		Line 1:
	'''svnmerge.py''' is a tool for automatic branch management. ('''NB''': See [http://subversion.tigris.org/svn_1.5_releasenotes.html Subversion 1.5 Release Notes] for [http://subversion.tigris.org/svn_1.5_releasenotes.html#merge-tracking merge tracking] features added in July 2008.) It allows branch maintainers to merge changes from and to their branch very easily, and automatically records which changes were already merged. This allows displaying an always updated list of changes yet to be merged, and totally prevents merge mistakes (such as merging the same change twice).		'''svnmerge.py''' is a tool for automatic branch management. It allows branch maintainers to merge changes from and to their branch very easily, and automatically records which changes were already merged. This allows displaying an always updated list of changes yet to be merged, and totally prevents merge mistakes (such as merging the same change twice).

	You can think of svnmerge as the equivalent of yellow sticky notes on a Subversion branch that record which revisions have been merged in already from one or more other branches, plus some useful functionality for viewing, managing and updating that information.		You can think of svnmerge as the equivalent of yellow sticky notes on a Subversion branch that record which revisions have been merged in already from one or more other branches, plus some useful functionality for viewing, managing and updating that information.

Aaronoliver: better hyperlink for mailing list

2009-09-02T13:23:32Z

better hyperlink for mailing list

← Older revision		Revision as of 06:23, 2 September 2009
Line 66:		Line 66:
	== Mailing List ==		== Mailing List ==

	A ~~mailing list has been established. Details are at:~~ http://www.orcaware.com/mailman/listinfo/svnmerge. The mailing list is the place to go for information about active development and new features.		A [http://www.orcaware.com/mailman/listinfo/svnmerge svnmerge mailing list] has been established. The mailing list is the place to go for information about active development and new features.

	List archives are available at:		List archives are available at:

Aaronoliver: corrected misspelling

2009-08-31T14:41:50Z

corrected misspelling

← Older revision		Revision as of 07:41, 31 August 2009
Line 175:		Line 175:
	</li>		</li>
	<li>If you just want to merge the ''whole'' branch into the trunk, you can simply do:<pre>$ svnmerge.py merge --bidirectional</pre>This command might report an error and tell you to use the <tt>-S</tt> (aka <tt>--head</tt>) option to disambiguate; this happens if you are tracking several branches at the same time in the trunk. In that case, just use something like: <pre>$ svnmerge.py merge --bidirectional -S BRANCH_NAME</pre>where <tt>BRANCH_NAME</tt> is a string useful to disambiguate (or the full URL if you prefer).<br/><tt>--bidirectional</tt> is useful if the branch is managed with svnmerge.py as well: in fact, it tells svnmerge.py to perform an additional analysys to automatically ignore changes in the branch which are just merges from the trunk itself (so-called ''reflected'' revisions).		<li>If you just want to merge the ''whole'' branch into the trunk, you can simply do:<pre>$ svnmerge.py merge --bidirectional</pre>This command might report an error and tell you to use the <tt>-S</tt> (aka <tt>--head</tt>) option to disambiguate; this happens if you are tracking several branches at the same time in the trunk. In that case, just use something like: <pre>$ svnmerge.py merge --bidirectional -S BRANCH_NAME</pre>where <tt>BRANCH_NAME</tt> is a string useful to disambiguate (or the full URL if you prefer).<br/><tt>--bidirectional</tt> is useful if the branch is managed with svnmerge.py as well: in fact, it tells svnmerge.py to perform an additional analysys to automatically ignore changes in the branch which are just merges from the trunk itself (so-called ''reflected'' revisions).
	<li>If you want to cherry-pick some changes (or just merge some revision ranges), you can follow the same ~~advices~~ as in the section [[#Release branches\|Release branches]]. Make sure to always use <tt>--bidirectional</tt> to all <tt>avail</tt> and <tt>merge</tt> command you issue to ignore reflected revisions.</li>		<li>If you want to cherry-pick some changes (or just merge some revision ranges), you can follow the same advice as in the section [[#Release branches\|Release branches]]. Make sure to always use <tt>--bidirectional</tt> to all <tt>avail</tt> and <tt>merge</tt> command you issue to ignore reflected revisions.</li>
	<li>When you are done with the branch and you want to close it, you can uninitialize merge support from the trunk:<pre>$ svnmerge.py uninit -S BRANCH_NAME</pre>. This is useful because it keeps the house clean, reduces the number of available branches for merge, and keep the need of using the <tt>-S</tt> option at the bare minimum.</li>		<li>When you are done with the branch and you want to close it, you can uninitialize merge support from the trunk:<pre>$ svnmerge.py uninit -S BRANCH_NAME</pre>. This is useful because it keeps the house clean, reduces the number of available branches for merge, and keep the need of using the <tt>-S</tt> option at the bare minimum.</li>
	<li>It's also good practice to really close the branch:<pre>$ svn rm BRANCH_URL -m "branch is now closed"</pre>		<li>It's also good practice to really close the branch:<pre>$ svn rm BRANCH_URL -m "branch is now closed"</pre>