Re: "bk pull" is not updating my local repository
Thomas Glanzmann <[email protected]>
| Newsgroups | gmane.comp.version-control.bitkeeper.user |
|---|---|
| Message-ID | <[email protected]> |
Hello Timur, Hello, * Timur Tabi <[email protected]> [040823 23:03]: > I've made some changes to the code in my local repository. I know that > other people have made changes to the parent, so I want to pick up the > updated files and merge them into my current repository. I tried the > "bk pull" command, but the files in my repository are not updated. I > only want bk to update the files I have not yet edited, but it appears > to reject the 'pull' command because I have files checked out. That > doesn't make any sense to me, because how am I supposed to keep my > repository up-to-date while other people are checking in their changes? you just have to bk ci your deltas, not commit or propagate them. You can only import upstream changes to files that are not 'edited'. > takepatch: software/SCCS/s.Build is edited and modified; unsafe to So you try to import a delta to software/Build which you have modified. So 'bk ci software/Build' after that the bk pull should work. Thomas _______________________________________________ Bitkeeper-users mailing list [email protected] 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.