2.5 bk tree broken?

I did a "bk pull" from

http://lia64.bkbits.net:8080/linux-ia64-2.5

a few minutes ago, and was surprised when BitKeeper complained about lots of merge collisions (the bk tree into which I pulled hasn't even had a "bk edit" run in it, let alone any changes checked in).

Since I'm a neophyte at BK, I tried my usual fix (remove the whole tree, and run "bk clone" again). This succeeded without any reported errors, but time seems to have gone backwards. The tree I now see is missing some stuff that was checked into 2.5.72 (e.g fixes to include/asm-ia64/mca.h and arch/ia64/kernel/mca.h for cleaner handling of INIT events).

The Web interface to BK says the newest changeset in this tree was applied 5 weeks ago.

-Tony

Yes, what's there on bkbits.net is totally obsolete (5 weeks old!).

I know bkbits.net had a machine failure on Friday/Saturday.

BK folks: could you restore a recent version of the linux-ia64-2.5 repository?

Thanks,

	--david

Tony> I did a "bk pull" from
Tony> http://lia64.bkbits.net:8080/linux-ia64-2.5

Tony> a few minutes ago, and was surprised when BitKeeper complained Tony> about lots of merge collisions (the bk tree into which I Tony> pulled hasn't even had a "bk edit" run in it, let alone any Tony> changes checked in).

Tony> Since I'm a neophyte at BK, I tried my usual fix (remove the Tony> whole tree, and run "bk clone" again). This succeeded without Tony> any reported errors, but time seems to have gone Tony> backwards. The tree I now see is missing some stuff that was Tony> checked into 2.5.72 (e.g fixes to include/asm-ia64/mca.h and Tony> arch/ia64/kernel/mca.h for cleaner handling of INIT events).

Tony> The Web interface to BK says the newest changeset in this tree Tony> was applied 5 weeks ago.

Tony> -Tony - To unsubscribe from this list: send the line Tony> "unsubscribe linux-ia64" in the body of a message to Tony> [email protected] More majordomo info at Tony> http://vger.kernel.org/majordomo-info.html

Try again. It looks like the tree should be back to normal.

	--david

Tony> I did a "bk pull" from
Tony> http://lia64.bkbits.net:8080/linux-ia64-2.5

Tony> a few minutes ago, and was surprised when BitKeeper complained Tony> about lots of merge collisions (the bk tree into which I Tony> pulled hasn't even had a "bk edit" run in it, let alone any Tony> changes checked in).

Tony> Since I'm a neophyte at BK, I tried my usual fix (remove the Tony> whole tree, and run "bk clone" again). This succeeded without Tony> any reported errors, but time seems to have gone Tony> backwards. The tree I now see is missing some stuff that was Tony> checked into 2.5.72 (e.g fixes to include/asm-ia64/mca.h and Tony> arch/ia64/kernel/mca.h for cleaner handling of INIT events).

Tony> The Web interface to BK says the newest changeset in this tree Tony> was applied 5 weeks ago.

Tony> -Tony - To unsubscribe from this list: send the line Tony> "unsubscribe linux-ia64" in the body of a message to Tony> [email protected] More majordomo info at Tony> http://vger.kernel.org/majordomo-info.html