This link has been bookmarked by 105 people . It was first bookmarked on 15 Oct 2006, by Danny armstrong.
-
26 Mar 12
-
Svnmerge.py
-
-
29 Feb 12
-
09 Nov 11
-
28 Sep 11
-
13 May 11
-
28 Mar 11
-
24 Jun 10
-
23 Jun 10
-
05 Jun 10
-
02 Jun 10
dirtyaffairsHerramienta desarrollada en Python que facilita la gestión de ramas en Subversion.
-
sourcerebelsHerramienta desarrollada en Python que facilita la gestión de ramas en Subversion.
-
19 Feb 10
-
02 Oct 09
-
22 Sep 09
-
04 Sep 09
-
27 Aug 09
-
16 Jun 09
-
29 May 09
-
04 May 09
-
Quick Usage Overview
-
Quick Usage Overview
-
- Use svnmerge init to initialize merge tracking on a branch directory.
- Use svnmerge avail to review the revisions available for merging.
- Use svnmerge merge to merge in some or all available revisions from other branches.
- Commit the merge changes using svn commit.
- Return to step 2 and repeat.
Quick Usage Overview
-
Quick Usage Overview
-
This tutorial assumes that you are working on a recently-created development branch, made off the trunk. It also assumes that the development branch has never merged changes from the trunk.
-
Merging development branches back to trunk
-
This example pulls changes made on the development branch to your trunk.
-
svn co trunk trunk; cd trunk)
-
-
16 Jan 09
-
14 Jan 09
-
-
04 Dec 08
-
16 Nov 08
-
24 Oct 08
-
23 Oct 08
-
03 Oct 08
-
30 Sep 08
-
12 Sep 08
Jamie Kirkpatricksvnmerge.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 change
-
16 Jul 08
-
15 Jul 08
-
08 Jul 08
-
27 Jun 08
-
09 May 08
-
24 Apr 08
-
- When I merge changes from my branch into the trunk and then later merge trunk into the branch, I get the error "Trying to add new property 'svnmerge-integrated' with value 'xxx' but property already exists with value 'yyy'.
- Apply the patch discussed here to avoid the problem, and use "svn resolved ." to fix it. Note that there is some controversy around the patch - see this discussion for the details.
-
- How do I migrate from svnmerge.py to Subversion 1.5's Merge Tracking?
- Use svnmerge-migrate-history.py to convert the merge history written by svnmerge.py into Subversion 1.5's format.
-
-
31 Mar 08
-
18 Mar 08
-
07 Mar 08
-
26 Feb 08
-
14 Feb 08
-
21 Jan 08
-
11 Jan 08
-
03 Dec 07
-
01 Nov 07
-
15 Oct 07
-
11 Oct 07
-
21 Sep 07
-
07 Sep 07
-
06 Sep 07
-
22 Aug 07
-
15 Aug 07
-
07 Aug 07
-
20 Jul 07
-
04 Jul 07
-
16 May 07
-
06 Apr 07
-
02 Apr 07
-
13 Mar 07
-
08 Feb 07
-
07 Feb 07
-
25 Jan 07
-
23 Dec 06
afonsofnsvnmerge.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 change
-
21 Nov 06
Philippe Normanda 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
-
10 Nov 06
-
15 Oct 06
-
svnmerge.py is a tool for automatic branch management.
-
svnmerge never commits anything; it always leaves that final step to you. Use svn revert -R . if you need to start over. Note however that "svn revert" will not delete any files added by the merge, so you may have to remove some files yourself to get a complete reversion.
-
-
28 Sep 06
-
03 Aug 06
Blair Kitchens 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 to display an always updated list of changes yet to be m
Would you like to comment?
Join Diigo for a free account, or sign in if you are already a member.