[PATCH] fixes for log -v

John A Meinel john at arbash-meinel.com
Sat Jul 16 14:40:51 BST 2005

Lalo Martins wrote:
> And so says John A Meinel on 16/07/05 00:26...
>>Aaron Bentley wrote:
>>>But of course, the whole point of these patches is to allow
>>>the root ID to vary.
>>Is that actually the point? For me, the point was just so that you can
>>merge a root id into another tree at some non-root location.
> Which will cause the new revision to have a different root-id than one
> of its ancestors, no?  ;-)

Actually, no. The current tree gets a subdirectory with the same id as
the old tree's root.

Here, before merge, 2 branches:

	.bzr/ # Root-id = lib-1111
	file1.c # parent-id = lib-1111, file-id = file1c-1111

	.bzr/ # root-id = main-2222
	file2.c # parent-id = main-2222, file-id = file2c-2222

After merge
	.bzr/ # root-id = main-2222
	file2.c # parent-id = main-2222, file-id = file2c-2222

	$lib/ # file-id = lib-1111, parent-id = main-2222
		file1.c # parent-id = lib-1111, file-id = file1c-1111

All that changed is that you added a directory into main. You loose the
.bzr directory in $lib/, which means that no root ids change.

At least that is my first idea about what to do.

Now, if you merged the other way, you could have the same affect in the
"lib" project, by moving the root id to ./lib and creating a new entry
in main.

I suppose it depends on how you look at it.
I see adding $lib to $main to be a change to the $main project, and not
affecting $lib at all (it doesn't even need to know about the combination).
I suppose you could perform the merge on the $lib project, in which case
you would have to change the root id.
> best,
>                                                Lalo Martins
> --
>       So many of our dreams at first seem impossible,
>        then they seem improbable, and then, when we
>        summon the will, they soon become inevitable.
> --
> http://www.exoweb.net/                  mailto:lalo at exoweb.net
> GNU: never give up freedom                 http://www.gnu.org/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050716/4aa1efed/attachment.pgp 

More information about the bazaar mailing list