Tracking projects: "bk export" confusion, merging upstream changes, multiple local changes
"Kevin P. Fleming" <[email protected]>
| Newsgroups | gmane.comp.version-control.bitkeeper.user |
|---|---|
| Organization | Back To Basics Network Management |
| Message-ID | <[email protected]> |
OK, I'm tracking a large external project, so I'm using the preferred tracking model. I've got a master repo that tracks the external project. I have about a dozen clones of that repo, each containing a logically contained change that I have made to the project. I also have a few "combined" repos where I have combined my local changes together for testing and use. This works fine, except for three things: - when I clone one of my change repos, and want to export a patch containing that change, I can't find a good way to tell "bk export" what I want. If I export all ChangeSets in the repo, I get my changes plus all the "bk pulls" from the master that have happened since clone repo was created. I don't want that... I want to create a patch containing _only_ the ChangeSets that have ChangeSet numbers like 1.<n>, in other words, only ChangeSets that belong to this repo. - when the upstream maintainers merge one of my changes, I'd like to be able to "unpull" my local copy of that change from my combined repos, so I can pull in the upstream change directly (in case the maintainers modified my changes when they merged them in). It doesn't appear as though that is possible, so right now I just pull from the master into my local change repo (the one that was merged upstream), resolve any conflicts, and then pull from there into my combined repos again. - when I have local changes that are dependent on each other, or had merge conflicts with an upstream update, I need to pull them all into my combined repo as a unit, not as individual pulls, or I'll end up manually correcting the same merge conflicts I already fixed! It appears that using "bk pull -R ..." multiple times may do what I need: pull in lots of changes from elsewhere, but handle them as a single ChangeSet (by running "bk resolve" after all the pulls) so their interdependencies can be automatically taken care of. Is this correct? _______________________________________________ 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.