Re: Tracking projects: "bk export" confusion, merging upstream changes, multiple local changes

Hello,

> - 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.

I use the following one, because it exports bitkeeper keywords. I need
these keywords for my checksum. See also unreviewed bugreport[2].

bk rset -hr`bk repogca`,+ | grep -v ^BitKeeper | bk gnupatch -du -e -h -T

I attached an ugly script which generates automatically patches and
publishes them in my webtree, if there is need to.

> - 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.

Whenever that happened to me, bitkeeper took automatically care of this.
However, if there is a conflict, you only have to merge it once (in the
feature tree).


			   # # # # # # # # #
			   # upstream repo #
			   # # # # # # # # #
			 /         |         \
			/          |          \
	    # # # # # # #    # # # # # # #     # # # # # # #
	    # feature 1 #    # feature 2 #     # feature 3 #
	    # # # # # # #    # # # # # # #     # # # # # # #
	                \          |          /
	           (pull)\         |(pull)   / (pull)
			  \  # # # # # # #  /
			   \ # work repo # /
			     # # # # # # #

Where feature X are clones from upstream tracking with one feature per
repository added. You can do a bkparentdiff[1] in each feature
repository to get a 'patch per feature'.

Honestly,
	Thomas

[1] bkparentdiff (I already filed a bugreport to fix this in the bk export, but no response so far)
	bkparentdiff is aliased to `bk rset -hr`bk repogca`,+ | grep -v ^BitKeeper | bk gnupatch -du -e -h -T'

[2] bk export -Tpatch doesn't expand keywords
	http://db.bitkeeper.com/cgi-bin/view.cgi?id=2004-08-20-003
_______________________________________________
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.