lkml.org 
[lkml]   [2002]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: Problems using new Linux-2.4 bitkeeper repository.
    James Bottomley wrote:

    >jgarzik@mandrakesoft.com said:
    >
    >>Through the magic of BK :)
    >>
    >
    >>Just do a 'bk pull' on my marcelo-2.4 tree. Since it is based on the
    >>original linux-2.4 tree just like Marcelo's tree, I was able to merge
    >>from my 2.4 line to his 2.4 line.
    >>
    >
    >Well, I tried this, but it just gave me a slew of initial rename conflicts.
    >

    This is normal, you just need to accept the remote changes for all those
    new/renamed files. BitKeeper doesn't support doing this automatically
    for all files, so I had to highlight the expected BitKeeper response in
    another window, and then click <paste> on my mouse around 300 times...
    (~300 new files)

    Jeff






    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 13:24    [W:0.023 / U:29.596 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site