Subversion: Quick test to check that all branch commits have been merged into trunk
In Subversion, here's a quick way to check that all branch commits have been merged into trunk:
- check out trunk into two folders: trunk1 and trunk2
- re-merge all branch commits into trunk2
- diff trunk1 and trunk2. They should be the same. Ignore conflicts. Anything new in trunk2 hasn't been merged into trunk.
And someone should really write a Perforce-style Time-Lapse View tool for Subversion. This is basically a 2-pane visual diff tool with a slider that you drag to scroll through all revisions of a file, to see what changed at each commit. The left side shows revision N, the right side shows revision N+1.
- check out trunk into two folders: trunk1 and trunk2
- re-merge all branch commits into trunk2
- diff trunk1 and trunk2. They should be the same. Ignore conflicts. Anything new in trunk2 hasn't been merged into trunk.
And someone should really write a Perforce-style Time-Lapse View tool for Subversion. This is basically a 2-pane visual diff tool with a slider that you drag to scroll through all revisions of a file, to see what changed at each commit. The left side shows revision N, the right side shows revision N+1.
posted by Jonathan at
9/07/2007 09:58:00 p.m.
0 Comments:
Post a Comment
<< Home