Re: setting up tracking/work/merge repos
"Kevin P. Fleming" <[email protected]>
| Newsgroups | gmane.comp.version-control.bitkeeper.user |
|---|---|
| Organization | Back To Basics Network Management |
| Message-ID | <[email protected]> |
Robert P. J. Day wrote: > > "bk clone" the bkbits-managed repo -- call this the "tracking" repo -- > which i have no permission to change at the source. (i might informally > submit patches, but i have no developer access so, for the purpose of > this exercise, it's read-only). Right. After pulling it down the first time, do "bk level 0" in this clone. > "bk clone" tracking repo to "work" repo, where i'll do all my own > changes. so, currently, the tracking repo will be the parent of the > work repo. Right. Do "bk level 1" in this repo. This will keep you from accidentally pushing changes into the tracking repo. > one more time, "bk clone" to create what i'll call the "merge" repo, > which is where i'll try to merge the changes from both of the above: > > NET --> tracking repo --> work repo > \--> merge repo I wouldn't do it this way. There's a simpler method, because (as you mentioned later (which I snipped)), there's no value in the merge repo sitting around when you don't need it. Make your local changes in the "work" repo, and do what you want with them. Periodically pull master update into the tracking repo from the BK/Bits source. When you want to merge the latest set of master updates with your local changes, do this: 1) bk clone -l tracking merge 2) cd merge 3) bk pull ../work 4) resolve conflicts, if any 5) bk push ../work 6) cd .. 7) rm -rf merge There is never any need to "reparent", as you can manually push/pull to any repo you desire. The repo path stored in "bk parent" is just a default if you don't specify a different path when you push/pull. Using this method ensures you don't actually work on resolving merge conflicts in your "work" repo, which could cause it to become unbuildable (or worse). The work repo only gets updated after you are satisfied that the contents of the updated tracking repo and the local changes are successfully combined (including doing test builds, etc). _______________________________________________ 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.