Re: Tracking projects: "bk export" confusion, merging upstream changes, multiple local changes
"Bryan O'Sullivan" <[email protected]>
| Newsgroups | gmane.comp.version-control.bitkeeper.user |
|---|---|
| Message-ID | <[email protected]> |
On Sun, 2004-10-03 at 09:52 -0700, Kevin P. Fleming wrote: > - 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. bk export -tpatch -r`bk repogca my-parent-repo-url`,+ > - 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). You can use "bk cset -x" for this. It won't work if your changes created (or perhaps renamed) any files, because BK gets shirty, telling you about create/sfile conflicts. In which case you need to "bk rm" either the local or remote file first. I prefer not to use "cset -x", instead letting BK handle the merge, with manual resolution if needed. That way, the change history doesn't have spurious undo events in there. > - 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! I've had this happen a few times, but I don't remember how to even reproduce the situation, much less what to do about it. Sigh. <b _______________________________________________ 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.