httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Roy T. Fielding" <>
Subject Re: proxy - a return.
Date Thu, 27 Sep 2001 01:12:57 GMT
> One problem though - the documentation file for proxy was moved out
> without it's history. The new file now has a history of it's own - is
> there a way of merging two ,v files?

You can choose the oldest and then replay the commitlog diffs.  Or you
can branch it at some common revision, apply the new changes to that
branch, and then have cvs merge the result.  Or you can do what I do
and just dump the old ones and keep the ones you like, with a single
commit that credits all of the people who added stuff before.


View raw message