Karl Fogel wrote:
> Blair Zajac <blair_at_orcaware.com> writes:
>> Karl Fogel wrote:
>>> Blair Zajac <blair_at_orcaware.com> writes:
>>>> Karl Fogel wrote:
>>>>> I thinkd say you should merge trunk to your branch quite frequently. At
>>>>> least every few days, though of course it really depends on the rate &
>>>>> kind of changes that happen on trunk. Don't let your branch get too far
>>>>> out of sync...
>>>> I wish that were possible with the current merging code :(
>>> You wish it were possible to get too far out of sync, or you wish it
>>> were possible to merge very often?
>>>
>>> (I'm assuming the former, but just want to make sure there isn't
>>> something I didn't know about :-) ).
>> To merge often.
>>
>> Do a checkout of the file-externals branch and try to merge trunk into it.
>
> I haven't had time to perform that experiment, but it sounds like you're
> saying something very surprising: that if you do merges fairly
> frequently, they fail, but if you do them less frequently, they succeed.
>
> I mean, you should be pulling in the same changes, it's just a question
> of how you're batching them, right?
No, I'm not saying that. It has nothing to do with frequency. Just that the
current merge code doesn't handle when the issue-3000 commit into trunk was done
then you want to merge that to another branch.
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-23 17:39:48 CEST