fre 2007-01-05 klockan 17:03 +0100 skrev Henrik Nordstrom: > fre 2007-01-05 klockan 15:58 +0100 skrev Henrik Nordstrom: > > lör 2007-01-06 klockan 03:27 +1300 skrev Amos Jeffries: > > > Um, > > > I seem to have a bit of a problem, or at least a worry I can't get > > > rid > > > of myself. > > > > > > I pulled a copy of the squid3-ipv6 and squid3 main branch to see what > > > needs > > > doing from the last 21 months. > > > I found quite a lot of changes that needed pulling in, so tried running > > > "cvsmerge HEAD" (your script I pulled from the dev website) which tells > > > me > > > there are no changes to be made. Yet I know there is a nearly 2MB diff > > > between the two when I diff it manually. > > > > Hmm... seems you either succeeded in bringing it up to date or someone > > reset the merge tag.. looks like the latter. Bummer. > > > > Let me see if I can restore the merge tag. Give me some minutes. > > Ok. Tag is restored and I am doing an initial merge for you to bring the > branch up to date.
Done. Wasn't too bad in terms of automatic conflicts, but I have not attempted building the result..
signature.asc
Description: Detta är en digitalt signerad meddelandedel
