bk pushed to deleted files?

Hollis Blanchard hollisb at us.ibm.com
Wed Feb 18 09:44:38 EST 2004

On Feb 17, 2004, at 3:01 PM, Hollis Blanchard wrote:
> Hi, I just pushed some changes to include/asm-ppc64/hvconsole.h,
> arch/ppc64/kernel/hvconsole.c, and drivers/char/hvc_console.c.
> Unfortunately this is what I see:
> 	drivers/char/hvc_console.c: 2 deltas
> 	BitKeeper/deleted/.del-hvconsole.c: 3 deltas
> 	BitKeeper/deleted/.del-hvconsole.h: 3 deltas
> ... despite the fact that neither of those two files have ever been
> deleted, Of course my changes were not applied to the correct
> (undeleted) files.

The files were deleted at ameslab recently when there was a merge
conflict from upstream, and my tree was from before that deletion, so
bk correctly noted that my diffs were to a deleted version of the file.

I've just pushed the lost changes again, which unfortunately won't be
associated with the not-lost changes in a Changeset.

Who knew merging could be so hazardous...

Hollis Blanchard
IBM Linux Technology Center

** Sent via the linuxppc64-dev mail list. See http://lists.linuxppc.org/

More information about the Linuxppc64-dev mailing list