Re: [Gnu-arch-users] [MERGED: abentley-20]

[James Blackwell]

> James Blackwell wrote:
>> I took patches 1,2 and 4
>> 
>> address@hidden/tlasrc--smallstuff--1--patch-1
>> address@hidden/tlasrc--smallstuff--1--patch-2
>> address@hidden/tlasrc--smallstuff--1--patch-3
>> address@hidden/tlasrc--smallstuff--1--patch-4
>> 
>> patch-2 conflicts with your tla--devo--1.3--patch-5; how should this be 
>> handled?
>

Aaron Bentley:
> Which patch does it conflict with? 
> address@hidden/tla--devo--1.3--patch-5?
>
> Or did you mean 
> address@hidden/tlasrc--devel--0.2--patch-5?

I must have been really tired last night. Here's what I see now:

address@hidden:~/tla/mytla/src/tla$ tla missing -s
address@hidden/tlasrc--smallstuff--1
base-0
    tag of
address@hidden/snapshot-tla--devo--1.3--base-0
patch-8
    Merge with Robert's integration
patch-9
    Updated cmd-commit to match changes to arch_revision_exists
patch-12
    Conservative fix for the library_find bogosity
patch-14
    added --silent option to file-find
patch-15
    Added partner-versions
patch-16
    Merge with rbtcollins
patch-18
    Broke hard links in set-tree-version (tlasrc--devel--0)

So I guess I've got 'em.

-- 
James Blackwell          Try something fun: For the next 24 hours, give
Smile more!              each person you meet a compliment!

GnuPG (ID 06357400) AAE4 8C76 58DA 5902 761D  247A 8A55 DA73 0635 7400