[Seaside-dev] Scriptaculous-Core-obi.43

[Julian Fitzell]

But if you don't use the merge tool then the ancestry is not recorded.
This means that further attempts to merge any descendant of the
unmerged version will cause problems

Julian

On Sat, Oct 11, 2008 at 5:56 PM, Gerhard Obermann <obi068 at gmail.com> wrote:
> Hi!
>
> I have merged the two 42 versions by not using the merge tool!
> Both 43 versions are identically anyway!
>
>
> cheers
> Gerhard
>
> On Sat, Oct 11, 2008 at 5:46 PM, Philippe Marschall
> <philippe.marschall at gmail.com> wrote:
>>
>> The commit comment says merged but it has only one ancestor
>> (Scriptaculous-Core-jf.42). I committed Scriptaculous-Core-pmm.43
>> which really merges. I propose to delete Scriptaculous-Core-obi.43.
>>
>> Cheers
>> Philippe
>> _______________________________________________
>> seaside-dev mailing list
>> seaside-dev at lists.squeakfoundation.org
>> http://lists.squeakfoundation.org/mailman/listinfo/seaside-dev
>
>
> _______________________________________________
> seaside-dev mailing list
> seaside-dev at lists.squeakfoundation.org
> http://lists.squeakfoundation.org/mailman/listinfo/seaside-dev
>
>