| Search by tag or site | Login to my blog ? Start my own blog |
 |
Jon Aquino's Mental GardenTechnologies that make life wonderful |
Subversion: Quick Test To Check That All Branch Commits Have Been Merged Into Trunk
Posted on 09/09/2007 00:19:14 | Link | Post Comment
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.
- Cool Service: Uptime Website Monitoring Service
- Svn Time-lapse View
- Royal Canadian Air Force "5bx" Daily 15-minute Exercise Program
- Simplicity And Difficulty Are Orthogonal
- October Challenge: Reading Knuth's "the Art Of Computer Programming"
- Oct 2007
- Sep 2007
- Aug 2007
- Jul 2007
- Jun 2007
- May 2007
- Apr 2007
- Mar 2007
- Feb 2007
- Jan 2007
- Dec 2006
- Nov 2006
- Oct 2006
- Sep 2006
- Aug 2006
- Jul 2006
- Jun 2006
- May 2006
- Apr 2006
Examples
Morpheus Trading - Mon Jul 21, 2008 08:33AM
NOTE: Please click on the charts below to enlarge them if [read more]
NOTE: Please click on the charts below to enlarge them if [read more]
Morpheus Trading - Mon Jul 21, 2008 08:31AM
NOTE: Please click on the charts below to enlarge them i [read more]
NOTE: Please click on the charts below to enlarge them i [read more]
Millionaire Now! by Larry Nusbaum - Fri Jul 18, 2008 08:23AM
U.S. stock futures rebound on Citigroup results"S&a [read more]
U.S. stock futures rebound on Citigroup results"S&a [read more]
<< My Home | TheMoneyBlogs Home