A repeat of the crystal-cvs post for the benefit of those who aren't
subscribed there:
The history file will be invalid if we merge history from a branch
into the trunk without moving all branch history entries to the merge
date. A change on the Streaming Loader branch for 2006/06/01 does not
exist in trunk at 2006/06/01, so if a history entry is merged into
mainline that indicates such, it will be inaccurate and misleading.
For this reason I think branch changes should be documented in a
branch specific history file, and then relevant entries should be
manually added to the trunk history on the date of the re-integration
into trunk. Anyone looking for a change history on a branch could then
check branch-history.txt and anyone looking for history on the trunk can
check history.txt.
Merges from trunk to the branch should also be documented with a
brief entry in the branch history file (i.e. 2006/06/01 - Integration
from current trunk HEAD to Stream Loader branch)
Rhad/Andrew
Jorrit Tyberghein wrote:
> Like all other files. SVN will resolve the conflicts as much as
> possible and the rest has to be resolved manually because SVN will
> mark in the file what it couldn't merge. CVS did the same.
>
> Greetings,
>
> On 6/3/06, David Bronke <[EMAIL PROTECTED]> wrote:
>
>> How is history.txt going to work with the SoC branches? There will be
>> commits happening at different times in the branch and in head... when
>> the two are merged, how should history.txt be handled?
>>
>> Dave
>> --
>> Lead Programmer
>> G33X Nexus Entertainment
>> http://games.g33xnexus.com/precursors/
>>
>> v3sw5/7Hhw5/6ln4pr6Ock3ma7u7+8Lw3/7Tm3l6+7Gi2e4t4Mb7Hen5g8+9ORPa22s6MSr7p6
>> hackerkey.com
>>
>>
>> _______________________________________________
>> Crystal-main mailing list
>> [email protected]
>> https://lists.sourceforge.net/lists/listinfo/crystal-main
>> Unsubscribe: mailto:[EMAIL PROTECTED]
>>
>>
>
>
>
_______________________________________________
Crystal-main mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/crystal-main
Unsubscribe: mailto:[EMAIL PROTECTED]
