[BUG] 3780 'bzr ignore' in subdirectory should prepend relative path

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Richard Wilbur wrote:
> John,
> 
> I am working on code for bug 3780 and have a question:  How would you
> recommend I reconcile the changes with what has happened on the
> baseline?
> 
> I branched my local bzr.dev from the main repository on 11 Oct 2006 with
> 2071 revisions.  (I'm not sure that means I have revision 2071 as
> recorded in the commits mailing list.)

Most likely it does. If you do 'bzr log' is the commit message:
  (John Arbash Meinel) use lazy importing to improve startup time

> 
> My development for this bug fix has happened on a local branch
> (giveback) from my local bzr.dev branch.
> 
> I just ran the full test suite (as far as I know):
> ~/bzr/giveback$ ./bzr selftest
>        bzr: /home/rwilbur/bzr/giveback/bzr
>     bzrlib: /home/rwilbur/bzr/giveback/bzrlib
> 
> running tests...
> ...tests.test_sftp_transport.SSHVendorConnection.test_connection_paramiko: ERROR
> bzrlib.tests.blackbox.test_serve.TestBzrServe.test_bzr_connect_to_bzr_ssh: ERROR
> [=====================================================] OK     4034/4034
> 
> I expect this is either a configuration or pre-existing problem as my
> unchanged branch exhibits the same two regressions.

Just to check, do you have paramiko installed? It sounds like those
tests are failing without it (which is a bug and should be fixed, but
may have already been fixed).

> 
> Should I:
> ~/bzr/bzr.dev$ bzr pull; cd ../giveback
> ~/bzr/giveback$ bzr merge ~/bzr/bzr.dev; cd ..
> [..fix any merge collisions..]
> ~/bzr$ bzr diff -p1 bzr.dev giveback >patch_bug3780.txt
> 
> Sincerely,
> 
> Richard

This is close to what I would do. My personal flow would be:

~/bzr/bzr.dev$ bzr pull; cd ../giveback
~/bzr/giveback$ bzr merge ../bzr.dev
# Are there any conflicts? If yes, resolve and commit
# if no, just 'bzr revert' since it should apply cleanly.

~/bzr/giveback$ bzr bundle ../bzr.dev > ../bug3780.patch

If you initially did 'bzr branch bzr.dev giveback' you can even just do:
~/bzr/giveback$ bzr bundle > ../bug3780.patch

Since bzr would remember what parent it came from, and bundle defaults
to using that as the base.

If you don't want to send a bundle, then I would do:

~/bzr/giveback$ bzr diff -rancestor:../bzr.dev > ../bug3780.diff

I *don't* recommend -p1, as I personally don't like them. If you prefer
it, that is your business, but we had it as the default for a while, and
most of us found we preferred -p0 to -p1. (Kernel hackers prefer -p1
because that is the culture).

I have a personal habit of using .patch for bundles and .diff for plain
diffs. But I don't think anyone else follows that convention. As long as
you don't use .bundle since most mail clients attach it as a non-text
attachment, which prevents reviewing the change in a mail reader.

John
=:->




-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFNcJ5JdeBCYSNAAMRAq7eAKDJJsP/s9Fwgbb/tEZVfbddIF0AegCg1+WN
bjygk4dC0TiyZ8h6JDm+gLE=
=d6No
-----END PGP SIGNATURE-----