Re: "bk pull" is not updating my local repository
Sam Ravnborg <[email protected]>
| Newsgroups | gmane.comp.version-control.bitkeeper.user |
|---|---|
| Message-ID | <[email protected]> |
On Mon, Aug 23, 2004 at 11:27:12PM +0200, Thomas Glanzmann wrote: > 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. I sometimes do: bk diffs -p `bk sfiles -c ` > fish bk unedit `bk sfiles -c` bk pull bk patch -p1 < fish In other words. Store all changes as one patch, get rid of the changes, and pull from pareant. Then apply my changes again. Sam _______________________________________________ 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.