On Sat, May 14, 2005 at 01:13:31AM +0200, M.Canales.es wrote:
> 
> Revising the webcvs I noticed that the historial is already loss in the 
> cross-lfs branch due the big changes in the book structure.

That can be folded back in. For instance, every file that is in the same
location within the book's structure and also has the same name will
inherit the history from trunk when it is copied over. The effect will
basically just be a big diff on the file. For any file that has moved or
changed names, the corresponding file in trunk can be svn moved to match
*before* the files are copied. Thus the files moved will also inherit
trunk's history. Of course, anything that exists in the branch and not
in trunk will start fresh as a new file, but that would happen
regardless.

Ultimately, what this method will do is wipe the branch's history, and
trunk will maintain history. The copying of the branch back into trunk
will result in trunk recording this as a single point in time event and
the files will not bring along the history that accrued during their
time in the branch. Steps *could* be take to not lose any history, but
this would require almost 100% manual merging instead of simply
overwriting the files with the new versions (which just generates a big
diff).

So now we have a point of perspective... Is this branch replacing trunk,
or is it being assimilated by the trunk. If the latter, the trunk's
history is more important. I view it as the latter. BTW. I see trunk as
having more reason to keep history.

-- 
Archaic

Want control, education, and security from your operating system?
Hardened Linux From Scratch
http://www.linuxfromscratch.org/hlfs

-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to