Re: Merging changes into a second parent

Hello,

* Timur Tabi <[email protected]> [040910 01:19]:
> I just pushed in a bunch of changes into one parent.  I now want to
> push the same changes into another parent, but the code base is
> slightly different, so I will need to review the differences before
> pushing them.  Also, I only want to merge in the changes I made, not
> any other changes that I grabbed when I did a "bk pull".  What is the
> easiest way to do that?

Please make a backup copy of all repositories involved (just to get
sure).

However I would do it the following way:

Pull any changes from the parent you want to push later in into your
repository with your changed (or in a copy of this one (backup thing)).
Handle conflicts manual, if there are any and do tests of course.

(faui03) [~] t bkparentdiff
bkparentdiff is aliased to `bk rset -hr`bk repogca`,+ | grep -v ^BitKeeper | bk gnupatch -du -e -h -T'

I am using the above alias to get a diff between the current repository
and the repository I am going to push in (the parent). To make this work
for you - you have to set your bk parrent accordingly or specify the URL
to your parrent to `bk repogca /path/to/parent` in the above example.

The problem is that there is no easy way AFAIK to push changed that are
only local to the repository. That's why you have normally one
repository per feature and a seperate testing repository to pull
neighbour changed is. So you have to go with the bkparentdiff and kick
everything you don't want to in the new parent and use bk import to
import the patch. Maybe someone else has a better idea to handle this.

Hope that this does, what you wants.

Example:

	(faui00u) [~/work/slrn/slrn-hc] bkparentdiff
	diff -Nru a/src/misc.c b/src/misc.c
	--- a/src/misc.c        2004-08-16 14:22:42 +02:00
	+++ b/src/misc.c        2004-09-11 01:49:28 +02:00
	@@ -2066,6 +2066,9 @@
	    if ((str == NULL) && (dfl == NULL)) return -1;

	    Slrn_Keymap_RLI->edit_width = SLtt_Screen_Cols - 1;
	+   if (Slrn_Keymap_RLI->edit_width > Slrn_Keymap_RLI->buf_len)
	+          Slrn_Keymap_RLI->edit_width = Slrn_Keymap_RLI->buf_len;
	+
	    Slrn_Keymap_RLI->prompt = prompt;
	    *Slrn_Keymap_RLI->buf = 0;

Honestly,
	Thomas
_______________________________________________
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.