The clue is in:
>
> takepatch: <filename> is edited and modified, unsafe to
> overwrite
BK won't apply changes to files that you've modified locally. The only way
around it is to save a patch for that file using bk diffs -u <filename> >
/tmp/bk.diffs, then do a bk unedit <filename>. Repeat for all files
mentioned. Once done, redo your pull and then reapply you're changes using
patch. I've been campaigning for BK to automate this for some time so that
it works like cvs. However, they continue to resist ....
>
> So I type
>
> bk resolve
>
> because that's what the docs suggest I should do. It replies with
>
> Using monitor as graphical display
> resolve: can't find RESYNC dir, nothing to resolve?
There's nothing to resolve as the pull has failed completely because of
above. The only time you need to resolve is if you've committed changes to
files that have also been changed in the parent and BK's usually good
merging process can't cope.
--
Rgds, Andy Chittenden
*********************************************************************
This e-mail and any attachment is confidential. It may only be read, copied and
used by the intended recipient(s). If you are not the intended recipient(s),
you may not copy, use, distribute, forward, store or disclose this e-mail or
any attachment. If you are not the intended recipient(s) or have otherwise
received this e-mail in error, you should destroy it and any attachment and
notify the sender by reply e-mail or send a message to sysadmin@xxxxxxxxxxx
*********************************************************************
_______________________________________________
Bitkeeper-users mailing list
Bitkeeper-users@xxxxxxxxxxxx
http://bitmover.com/mailman/listinfo/bitkeeper-users
To unsubscribe from this list, go to the above URL, follow instruction at the
bottom of the web page.
|
