On 14/11/2011, at 9:55 AM, Richard Hipp wrote:

> 
> 
> On Sun, Nov 13, 2011 at 6:48 PM, Steve Bennett <ste...@workware.net.au> wrote:
> No comments on this?
> 
> It works for me. Shall I commit this fix, or are there potential issues with 
> it?
> 
> I think go ahead and commit.

FYI, what I committed this doesn't work perfectly in the case where a branch is 
closed.
In this case, the closed branch is still used as the ancestor.
I hacked the code a bit to detect this case and instead branch from trunk.
It was made more complicated by the fact that there was no obvious way to check 
if a branch is closed.
name_to_uuid() does most of what I need, but then it's not easy to determine if 
the leaf is closed.

Cheers,
Steve

>  
> 
> On 10/11/2011, at 3:17 PM, Steve Bennett wrote:
> 
>> On 10/11/2011, at 2:50 PM, Steve Bennett wrote:
>> 
>>> On 10/11/2011, at 2:30 PM, Steve Bennett wrote:
>>> 
>>>> I tried to do something similar, using a git tag to keep track of where I 
>>>> was up to
>>>> for the incremental import.
>>>> 
>>>> It mostly works, except the timeline shows each import as disconnected from
>>>> the previous import. See attached.
>>>> 
>>>> For the import at 21:40, I tried to import one previous rev hoping that 
>>>> they would be
>>>> merged, but this didn't happen. Is this "disconnect" fixable?
>>> 
>>> I guess the problem is that the first commit of an incremental import has no
>>> ancestor identified. Would it be possible to identify the ancestor somehow, 
>>> either
>>> on the command line, or by finding the tip of the corresponding branch?
>> 
>> The attached patch works for my simple case of always importing to the tip 
>> of trunk,
>> but I'm sure it is highly dubious in other situations.
>> 
> 
> --
> µWeb: Embedded Web Framework - http://uweb.workware.net.au/
> WorkWare Systems Pty Ltd
> W: www.workware.net.au      P: +61 434 921 300
> E: ste...@workware.net.au   F: +61 7 3391 6002
> 
> 
> 
> 
> 
> 
> _______________________________________________
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
> 
> 
> 
> 
> -- 
> D. Richard Hipp
> d...@sqlite.org
> _______________________________________________
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

--
µWeb: Embedded Web Framework - http://uweb.workware.net.au/
WorkWare Systems Pty Ltd
W: www.workware.net.au      P: +61 434 921 300
E: ste...@workware.net.au   F: +61 7 3391 6002





_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to