Re: Doing a dummy or empty merge

quoted

quoted

quoted

quoted

"Richard" == Richard Lee [off-list ref] writes:

Richard> At this point I want to merge this test branch into the live branch
Richard> despite not having made any commits apart from deployment related
Richard> changes on the test branch. I want this to be a dummy merge so that a
Richard> merge is recorded into the live branch, but the contents of the live
Richard> branch remain untouched. This is as if I made an empty commit on the
Richard> live branch.

I think you'll get what you want with a "merge -s ours" from test
to live.  That says that "I've looked at test, and I've looked at
the parents of live, and this is how I want the result to look".

Further commits on test can then be merged to live automatically using this
new merge as the (initial) base.  Of course, later commits after that will use
subsequent bases, but that should already work the way you want.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
[off-list ref] <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.vox.com/ for Smalltalk and Seaside discussion