Hi,
I am not sure I can make this clear as in Subversion context
"merge" has a different meaning from what I am trying to achieve:
merging two (or three) files into one *and* have their respective
history also merged. Just as if it had been one single file from the
beginning.
From old days I have a frameset in one website project, consisting
of exactly three files:
lecture.php (a HTML frameset)
content.php
footnotes.php
content.php is a rather long text (180KB), footnote.php (50KB) as
the name implies holds the footnotes. When originally set up
about a decade ago content and footnotes were separated for
user's convenience as going back and forth between text and
footnote was annoyingly slow then, so footnotes were made to
show in a separate frame. With today's machines it is not that
much of an issue anymore and we even might find a way to serve
the stuff in smaller even-sized, yet logical chunks, so in a first step
we want to get rid of that frameset and join the files into one, e.g.:
-- append footnotes.php to content.php;
-- overwrite lecture.php with the joined stuff
But we would like to have this new lecture.php having the history of
its anchestors, too! Just merged into one big history like the files
were merged into one. Is that possible at all?
AFAICS I can copy content & footnotes onto lecture and state that
in the commit message. Or I can svn delete lecture.php, copy
footnotes to content and svn rename this to a new lecture.php. Yet
either way I will lose direct access to the history of at least one of
the old files.
I know the notion about no history is lost with Subversion. I also
know about these pig_at_revisions, though failing myself to really
understand them from reading the book a while ago, yet this is for
content writers/editors, not programmers. I am not even sure these
special (super?) revisions can be accessed from the GUI tools
(mostly Tortoise) they use at all.
Any suggestion appreciated. This thing has bothered me the
whole last week, and I have to do it before next weekend as that
darn frameset is in the way of some other pending changes ...
Thank you,
JH
---------------------------------------
Freedom quote:
"The golden freedom cannot be paid for with any metal,
it is adequate for man as for the wild animals."
-- Motto of Hans and Paul Vredeman de Vries'
Freedom Painting of 1595 in Danzig
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2384013
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-16 10:57:28 CEST