Links

SVN --reintegrate merge

Once a --reintegrate merge is done from branch to trunk, the branch is no longer usable for further work. It's not able to correctly absorb new trunk changes, nor can it be properly reintegrated to trunk again. For this reason, if you want to keep working on your feature branch, we recommend destroying it and then re-creating it from the trunk:

$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
      -m "Remove my-calc-branch, reintegrated with trunk in r391."
Committed revision 392.
$ svn copy http://svn.example.com/repos/calc/trunk \
           http://svn.example.com/repos/calc/branches/my-calc-branch
      -m "Recreate my-calc-branch from trunk@HEAD."
Committed revision 393.
# 2012/05/07 Read More Source: svnbook.red-bean.com

Featured Items

Death Therapy

The Temptation of Jesus, Remixed

The Temptation of Jesus, Mercedes edition

2013 Resolution: Stock & Flow

2013 Resolution: Increase my Reading Quality

Financial Reform Videos

Multi-Resolution Blog Template

The Buffet Rule

Warren Buffet's Tax Debage

Multi-Resolution Blog Template

Multi-Resolution Blog Template

Better metric: Gallons per 10K Miles

Cadillac Escalade

Optimistic Assets: The Banking Crisis

Photo: Ice Berg

Embedded Video goes Viral

Video: Simpsons' Forclosure

Top of the Dropdown

Screenshot: Dropdown List Box

Credit Crisis: Cash Advances

Photo: Credit Cards

The 1 Percent Doctrine

Image: Blaise Pascal

Supply-Sided Environmentalism

Graph: Energy Savings

Is Oil A National Security Issue?

James Baker: Interview on Charlie Rose

Bike Light Review: Dinotte 600L

Dinotte 600L Bike Light

This Headline Suggested by Google

Pear Lake, Sequoia National Park, California

Quoting Google Video

Alberto Gonzalez: Interview on Charlie Rose

Google China: A very different image

Photo: Tiananmen Sqaure

Subscribe