recent changes

[John Arbash Meinel]

Martin Pool wrote:

>Hi, just an update on what I've been up to:
>
>Revisions now allow for tracking multiple parent revisions; those
>after the first are the revisions that have been merged-in.  This is a
>slight adjustment from what was previously planned, where the first
>revision would be stored specially.
>
>
Is this designed to be similar to monotone's merge functionality? Where
two branches diverge, and then are merged back together again?

This makes the "common_ancestor" code more complicated, since you have
potentially multiple paths to follow, but at least you can detect old
merges.

>Cherrypicked changes or removed changes need to be recorded
>separately.
>
>I've also started cleaning up testbzr so that both the whitebox and
>blackbox (run "python bzr") tests are handled in a single framework
>based on unittest.
>
>
Interesting. Might I recommend creating either a "test" package, or
possibly a whitebox & blackbox packages. I'm just thinking that as time
goes by, we'll probably want a very complete set of tests, and it would
be cleaner if we could break them into multiple files, and not have it
pollute the bzrlib directory.

My idea would be something like:

bzr.dev/bzrlib/
    commands.py ... etc
    selftest/
        __init__.py
        whitebox/
        	__init__.py
		a_test.py
        blackbox/
	        __init__.py
		a_test.py
		...



I like the idea of having everything under "bzr selftest" rather than a
separate front end.

I also think we would want to use "subprocess" if it is available, and
fall back to something that looks a lot like it.
Because you can install it as a module for 2.3, it is built-in to 2.4,
and it is much nicer than os.system, or popen*

Anyway, for the relocation stuff, here is the commands to do it:
cd bzr.dev/bzrlib
mkdir selftest
mkdir selftest/whitebox
mkdir selftest/blackbox
bzr add selftest
bzr rename selftest.py selftest/__init__.py
bzr rename whitebox.py selftest/whitebox/__init__.py
bzr rename blackbox.py selftest/blackbox/__init__.py

And then apply the attached patch. It just changes the import in
selftest to look in the correct location.

In the future, the whitebox/blackbox testing scripts can be updated to
pull in neighboring tests as necessary (you could do it automatically,
but adding a single line to the __init__.py script isn't too bad either).

John
=:->

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: test-subdirs.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20050620/8c9724ae/attachment.diff 
-------------- 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/20050620/8c9724ae/attachment.pgp