emacs-w3m?

emacs-w3m?

[Katsumi Yamaoka]

You seem to have committed share/emacs/site-lisp/w3m/ and the files
to the Emacs trunk.  Isn't it a mistake?

Re: emacs-w3m?

[Andreas Schwab]

Katsumi Yamaoka <yamaoka@jpl.org> writes:

> You seem to have committed share/emacs/site-lisp/w3m/ and the files
> to the Emacs trunk.  Isn't it a mistake?

There's also a 30MB log-n0.out and spurious change to configure.

commit d0644a08e3c5d125cc68025125398296549561dc
Author: Robert J. Chassell <bob@gnu.org>
Date:   Wed Feb 24 22:07:26 2010 +0000

    Merge: add word to sentence in trunk/doc/lispintro/emacs-lisp-intro.texi, in section Finding More Information

 configure                                 |18773 +-
 doc/lispintro/emacs-lisp-intro.texi       |    2 +-
 log-n0.out                                |817351 +++++++++++++++++++++++++++++
 share/emacs/site-lisp/w3m/ChangeLog       |10203 +
 share/emacs/site-lisp/w3m/ChangeLog.1     | 6731 +
 share/emacs/site-lisp/w3m/mew-w3m.el      |  474 +
 share/emacs/site-lisp/w3m/mime-w3m.el     |  227 +
 share/emacs/site-lisp/w3m/octet.el        |  547 +
 share/emacs/site-lisp/w3m/w3m-antenna.el  |  659 +
 share/emacs/site-lisp/w3m/w3m-bookmark.el |  588 +
 share/emacs/site-lisp/w3m/w3m-bug.el      |  192 +
 share/emacs/site-lisp/w3m/w3m-ccl.el      |  202 +
 share/emacs/site-lisp/w3m/w3m-cookie.el   |  578 +
 share/emacs/site-lisp/w3m/w3m-dtree.el    |  239 +
 share/emacs/site-lisp/w3m/w3m-ems.el      | 1410 +
 share/emacs/site-lisp/w3m/w3m-favicon.el  |  367 +
 share/emacs/site-lisp/w3m/w3m-fb.el       |  208 +
 share/emacs/site-lisp/w3m/w3m-filter.el   |  367 +
 share/emacs/site-lisp/w3m/w3m-form.el     | 1896 +
 share/emacs/site-lisp/w3m/w3m-hist.el     |  732 +
 share/emacs/site-lisp/w3m/w3m-image.el    |  266 +
 share/emacs/site-lisp/w3m/w3m-lnum.el     |  144 +
 share/emacs/site-lisp/w3m/w3m-load.el     |  447 +
 share/emacs/site-lisp/w3m/w3m-mail.el     |  396 +
 share/emacs/site-lisp/w3m/w3m-namazu.el   |  278 +
 share/emacs/site-lisp/w3m/w3m-perldoc.el  |  124 +
 share/emacs/site-lisp/w3m/w3m-proc.el     |  801 +
 share/emacs/site-lisp/w3m/w3m-rss.el      |  169 +
 share/emacs/site-lisp/w3m/w3m-search.el   |  365 +
 share/emacs/site-lisp/w3m/w3m-session.el  |  909 +
 share/emacs/site-lisp/w3m/w3m-symbol.el   |  230 +
 share/emacs/site-lisp/w3m/w3m-tabmenu.el  |  188 +
 share/emacs/site-lisp/w3m/w3m-ucs.el      |  109 +
 share/emacs/site-lisp/w3m/w3m-util.el     | 1421 +
 share/emacs/site-lisp/w3m/w3m-weather.el  |  510 +
 share/emacs/site-lisp/w3m/w3m.el          |10648 +
 share/info/emacs-w3m-ja.info              | 7014 +
 share/info/emacs-w3m.info                 | 7004 +
 38 files changed, 877176 insertions(+), 15593 deletions(-)

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: emacs-w3m?

[Robert J. Chassell]

    You seem to have committed share/emacs/site-lisp/w3m/ and the files
    to the Emacs trunk.  Isn't it a mistake?

Yes.  All I intended to do was to add the `be' to the sentence
in "An Introduction to Programming in Emacs Lisp".  I did evoke W3M Mode
to read BzrForEmacsDevs and BzrQuickStartForEmacsDevs since W3 Mode is
so slow.  That should not have made any difference, should it?  Does a
commit include libraries in your Emacs?

Should I use the following in a Bourne Again SHell in the
/usr/local/src/emacs/trunk/ directory?

    bzr remove configure log-n0.out share/emacs/site-lisp/w3m/ChangeLog share/emacs/site-lisp/w3m/ChangeLog.1 share/emacs/site-lisp/w3m/mew-w3m.el share/emacs/site-lisp/w3m/mime-w3m.el share/emacs/site-lisp/w3m/octet.el share/emacs/site-lisp/w3m/w3m-antenna.el share/emacs/site-lisp/w3m/w3m-bookmark.el share/emacs/site-lisp/w3m/w3m-bug.el share/emacs/site-lisp/w3m/w3m-ccl.el share/emacs/site-lisp/w3m/w3m-cookie.el share/emacs/site-lisp/w3m/w3m-dtree.el share/emacs/site-lisp/w3m/w3m-ems.el share/emacs/site-lisp/w3m/w3m-favicon.el share/emacs/site-lisp/w3m/w3m-fb.el share/emacs/site-lisp/w3m/w3m-filter.el share/emacs/site-lisp/w3m/w3m-form.el share/emacs/site-lisp/w3m/w3m-hist.el share/emacs/site-lisp/w3m/w3m-image.el share/emacs/site-lisp/w3m/w3m-lnum.el share/emacs/site-lisp/w3m/w3m-load.el
  share/emacs/site-lisp/w3m/w3m-mail.el share/emacs/site-lisp/w3m/w3m-namazu.el share/emacs/site-lisp/w3m/w3m-perldoc.el share/emacs/site-lisp/w3m/w3m-proc.el share/emacs/site-lisp/w3m/w3m-rss.el share/emacs/site-lisp/w3m/w3m-search.el share/emacs/site-lisp/w3m/w3m-session.el share/emacs/site-lisp/w3m/w3m-symbol.el share/emacs/site-lisp/w3m/w3m-tabmenu.el share/emacs/site-lisp/w3m/w3m-ucs.el share/emacs/site-lisp/w3m/w3m-util.el share/emacs/site-lisp/w3m/w3m-weather.el share/emacs/site-lisp/w3m/w3m.el share/info/emacs-w3m-ja.info share/info/emacs-w3m.info                
How do I remove unwanted and unintended files but retain wanted ones,
like configure?  A "bzr update -r99552" in my /usr/local/src/emacs/trunk/
directory would give me a correct configure, but what of the master?

Meanwhile, I am going to bed in a few minutes, It will be nine hours
before I connect to the Internet again.  If someone knows what do do,
please tell us, or do it yourself and please tell us.  I tried to follow
BzrForEmacsDevs and BzrQuickStartForEmacsDevs, and, as I said to Stefan
Monnier, "I hope I have done right."  It should not be too hard to
correct mistakes on the master.  However, I remember nothing
about the process in BzrForEmacsDevs or
BzrQuickStartForEmacsDevs.

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[David Reitter]

On Feb 24, 2010, at 9:11 PM, Robert J. Chassell wrote:

>    You seem to have committed share/emacs/site-lisp/w3m/ and the files
>    to the Emacs trunk.  Isn't it a mistake?
> 
> Yes.  

So, this has been rectified by another commit, but now everyone has 30MB of garbage in their history.

Mistakes can happen, and they will especially since the bzr setup makes it easy to commit all changed files and push them without further checks.  Entering the log message in an editor makes it easier to see the list of changed files - the -m parameter for a quick change seems dangerous.  I am a little surprised that additional files got added without explicit interaction with bzr.

The big question is whether this memory leak is acceptable.  We have 30 MB extra in this case.   Even if this is less when compressed, we're talking a lot of total storage given some 500 copies of the repository (??) and infinitely more bandwidth incurred in the future when checking out the repo.  (Infinite because Emacs will never die.)

Would the equivalent of "git reset olderrevid ;  git push -f" inconvenience people very much?

Re: emacs-w3m?

[Leo]

On 2010-02-25 15:26 +0000, David Reitter wrote:
> The big question is whether this memory leak is acceptable. We have 30
> MB extra in this case. Even if this is less when compressed, we're
> talking a lot of total storage given some 500 copies of the repository
> (??) and infinitely more bandwidth incurred in the future when
> checking out the repo. (Infinite because Emacs will never die.)

And if this mistake can happen so easily it will happen again.

Leo

Re: emacs-w3m?

[Andreas Schwab]

David Reitter <david.reitter@gmail.com> writes:

> So, this has been rectified by another commit, but now everyone has 30MB of garbage in their history.

It's only 6MB.

> Would the equivalent of "git reset olderrevid ;  git push -f" inconvenience people very much?

Don't even _think_ about that!

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: emacs-w3m?

[Óscar Fuentes]

Leo <sdl.web@gmail.com> writes:

> On 2010-02-25 15:26 +0000, David Reitter wrote:
>> The big question is whether this memory leak is acceptable. We have 30
>> MB extra in this case. Even if this is less when compressed, we're
>> talking a lot of total storage given some 500 copies of the repository
>> (??) and infinitely more bandwidth incurred in the future when
>> checking out the repo. (Infinite because Emacs will never die.)
>
> And if this mistake can happen so easily it will happen again.

The most terse way of achieving what he did is

bzr add
bzr commit -m "tons of things"

(from a bound branch, aka checkout)

Howevere, the committer didn't detailed what he did to commit all that
stuff and this is speculation. Needless to say, one ought to check
before committing. In this case, a simple `bzr diff' would do. Or just
use VC-dir.

Re: emacs-w3m?

[Óscar Fuentes]

Andreas Schwab <schwab@linux-m68k.org> writes:

>> Would the equivalent of "git reset olderrevid ; git push -f"
>> inconvenience people very much?
>
> Don't even _think_ about that!

Emphatically seconded.

Re: emacs-w3m?

[David Reitter]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

On Feb 25, 2010, at 11:24 AM, Andreas Schwab wrote:
>> Would the equivalent of "git reset olderrevid ;  git push -f" inconvenience people very much?
> 
> Don't even _think_ about that!

I hear you.
The consequences get worse in proportion to the time span between the faulty commit and the history manipulation.

What happens if somebody checked in code for which permission hasn't been obtained and can't be obtained?  Suppose the copyright-holder requests removal.  

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 203 bytes --]

Re: emacs-w3m?

[Andreas Schwab]

David Reitter <david.reitter@gmail.com> writes:

> What happens if somebody checked in code for which permission hasn't been obtained and can't be obtained?

That's nothing new, see etc/yow.lines.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: emacs-w3m?

[Stephen J. Turnbull]

David Reitter writes:

 > What happens if somebody checked in code for which permission
 > hasn't been obtained and can't be obtained?  Suppose the
 > copyright-holder requests removal.

Then you think (and do) the unthinkable, of course.  It would be very
good luck if that's all they want, though -- that scenario involves
much bigger problems.

Re: emacs-w3m?

[Andreas Roehler]

Stephen J. Turnbull wrote:
> David Reitter writes:
> 
>  > What happens if somebody checked in code for which permission
>  > hasn't been obtained and can't be obtained?  Suppose the
>  > copyright-holder requests removal.
> 
> Then you think (and do) the unthinkable, of course.  It would be very
> good luck if that's all they want, though -- that scenario involves
> much bigger problems.
> 
> 
> 
> 
> 
> 

My emacs-w3m files show "either version 2, or (at your option) any later version."

From there it shouldn't arise any difficulty. It's just to update the version.

Andreas

Re: emacs-w3m?

[bob]

No, I did not `bzr add'; I followed the instructions in BzrForEmacsDevs
and BzrQuickStartForEmacsDevs.  I did start W3m mode in my Emacs, but
why those files got committed to the master, I don't know.

David Reitter is right, 

       The consequences get worse in proportion to the time span between the =
       faulty commit and the history manipulation.

What are the `unthinkable' ways of removing unwanted files?  What do you
do when you make a mistake?

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[Óscar Fuentes]

bob@gnu.org Robert J. Chassell) writes:

> No, I did not `bzr add'; I followed the instructions in
> BzrForEmacsDevs and BzrQuickStartForEmacsDevs.  I did start W3m mode
> in my Emacs, but why those files got committed to the master, I don't
> know.

Last time I looked, it wasn't a good idea to mix the instructions of
those documents. Stick to one or another, but not both.

Definitely, those files were added with `bzr add'. You did it
inadvertently. The guides you use have very explicit steps for
describing their respective workflows. Knowing what you exectly did (if
you remember) would be useful, just to consider rewriting the parts that
could be the cause of the confusion.

> David Reitter is right, 
>
>        The consequences get worse in proportion to the time span between the =
>        faulty commit and the history manipulation.
>
> What are the `unthinkable' ways of removing unwanted files?

I'm not sure I understand your question. With bzr, you do `bzr uncommit
--revision N'. DON'T EVER DO THAT ON A PUBLIC BRANCH unless you want to
screw other's local mirrors. If you are not completely sure that you are
working on a local branch, don't use `uncommit'. Fortunately, there is a
setting on the FSF bzr repo that will not allow you to uncommit
something from it, but just in case that setting's implementation has
bugs, don't try it.

> What do you do when you make a mistake?

You commit the reverse patch.

Re: emacs-w3m?

[Robert J. Chassell]

    Definitely, those files were added with `bzr add'. You did it
    inadvertently.

I did not.  I did a commit and the command must have moved W3M mode
files in my running Emacs to the master, which I did not intend.  Why is
that?  How do I commit one file?

    Last time I looked, it wasn't a good idea to mix the instructions of
   those documents. Stick to one or another, but not both.

Where in BzrForEmacsDevs and BzrQuickStartForEmacsDevs does it say that
you should not commit?  The command is in both.  (I am serious;
remember, those who wrote BzrForEmacsDevs and BzrQuickStartForEmacsDevs
tried to explain Bazaar and I thought they did a good job.)

    > What are the `unthinkable' ways of removing unwanted files?

    I'm not sure I understand your question. With bzr, you do `bzr
    uncommit --revision N'. DON'T EVER DO THAT ON A PUBLIC BRANCH ...
    just in case that setting's implementation has bugs, don't try it.

OK, I won't.  Are you saying that no one has a low-probability-of-error
method in bzr that removes mistakes?  As Leo said,

   ... if this mistake can happen so easily it will happen again

which is true.

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[Óscar Fuentes]

bob@gnu.org (Robert J. Chassell) writes:

>     Definitely, those files were added with `bzr add'. You did it
>     inadvertently.
>
> I did not.

Yes, you did. Bazaar does not add files without being told so.

> I did a commit and the command must have moved W3M mode
> files in my running Emacs to the master, which I did not intend.  Why is
> that?

Without knowing the precise steps you follow, it's hard to tell.

>  How do I commit one file?

That's explained on

http://www.emacswiki.org/emacs/BzrQuickStartForEmacsDevs

which supposedly you are using as a guide.

The command is

bzr commit one-file another-file ...

but if some of the files are not versioned yet, you need to add them
first:

bzr add one-file

this is why I say that you did a `bzr add' before the commit (this or
your bzr version has a tremendous bug, but I think that that is
unlikely.)

>     Last time I looked, it wasn't a good idea to mix the instructions of
>    those documents. Stick to one or another, but not both.
>
> Where in BzrForEmacsDevs and BzrQuickStartForEmacsDevs does it say that
> you should not commit?  The command is in both.  (I am serious;
> remember, those who wrote BzrForEmacsDevs and BzrQuickStartForEmacsDevs
> tried to explain Bazaar and I thought they did a good job.)

I'm being serious too. You say that you are following the instructions
of *both* documents. And I insist on that you should pick just one.

>     > What are the `unthinkable' ways of removing unwanted files?
>
>     I'm not sure I understand your question. With bzr, you do `bzr
>     uncommit --revision N'. DON'T EVER DO THAT ON A PUBLIC BRANCH ...
>     just in case that setting's implementation has bugs, don't try it.
>
> OK, I won't.  Are you saying that no one has a low-probability-of-error
> method in bzr that removes mistakes?  As Leo said,
>
>    ... if this mistake can happen so easily it will happen again
>
> which is true.

As explained here on the past, pretending to correct an error on bzr is
similar to pretending to correct an error on a e-mail you sent to a
public mailing list. For fixing typos on commit messages and other
meta-information, some tools have mechanisms for amending one commit
with another commit, but the first commit remains there.

As for the mistakes, yes, they happen. We need to try hard to not incur
on them, but they will happen anyways. In this case, a simple `bzr diff'
just before committing would spit a diff 100 K-lines long and you would
notice that something was wrong.

If erroneous commits turns to be a serious problem, we could set up a
gatekeeper(*), although that workflow is a bit more complex than what
we have now.

* http://doc.bazaar.canonical.com/bzr.2.1/en/user-guide/using_gatekeepers.html

Re: emacs-w3m?

[Robert J. Chassell]

    >     Definitely, those files were added with `bzr add'. You did it
    >     inadvertently.
    >
    > I did not.

    Yes, you did. Bazaar does not add files without being told so.

I really don't think I did more than a `commit' but I cannot remember so
I am not sure.  As far as I know, the documentation does not recommend a
`diff' before a `commit' or an `add'.  It should so that a person
notices, even one who makes mistakes like I do.  Why did the files of
W3M mode in my Emacs get added?

    >  How do I commit one file?

    That's explained on

    http://www.emacswiki.org/emacs/BzrQuickStartForEmacsDevs

Actually, it does not that I found, but it is very useful to know that

    bzr commit one-file another-file ...

does exist.  Thank you.

It turns out that

  http://www.emacswiki.org/emacs/BzrForEmacsDevs                       

has information on `uncommit', which I had not realized before.  (In
other words, I noticed the command but paid no attention to it.)  The
documentation says `there s no compelling reason to do it if you're
just revising a change' so the presumption I would make (and probably
did) is that there was some easier way to remove an error:  That was
before I understood the implication that you add always, which is what
I now think (unless you want to do something difficult or have
possible bugs).

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[Stephen J. Turnbull]

Robert J. Chassell writes:

 > I really don't think I did more than a `commit' but I cannot remember so
 > I am not sure.

As Óscar says, that would require a rather spectacular bug in Bazaar;
I would surely expect it to be reported and I haven't seen such.

 > As far as I know, the documentation does not recommend a `diff'
 > before a `commit' or an `add'.  It should so that a person notices,
 > even one who makes mistakes like I do.

Maybe the documentation should recommend running "bzr status" before
committing, at least if you haven't committed within the limits of
your short-term memory.  This simply lists the files have been changed
and will be committed, along with a brief description of the change.

Alternatively, I think vc-dir gives you a directory view which makes
it easy to see status at a glance (I don't use vc-dir though, I may be
talking through my hat ... surely either vc or dired has some such
functionality).

 > Why did the files of W3M mode in my Emacs get added?

"Somebody ran 'bzr add'" is the only explanation consistent with the
documented behavior of Bazaar.  In particular, if you run "bzr add"
with no arguments, everything in the tree that is not already
versioned and is not listed in .bzrignore will be added.  Since AIUI
this is your first commit from that workspace, it seems possible you
did that at some time in the more or less distant past, and this issue
has been lurking ever since.

Re: emacs-w3m?

[Richard Stallman]

    > The big question is whether this memory leak is acceptable. We have 30
    > MB extra in this case. Even if this is less when compressed, we're
    > talking a lot of total storage given some 500 copies of the repository
    > (??) and infinitely more bandwidth incurred in the future when
    > checking out the repo. (Infinite because Emacs will never die.)

    And if this mistake can happen so easily it will happen again.

Would someone please discuss this with the BZR developers?
That's the way to make useful progress happen.

Re: emacs-w3m?

[Miles Bader]

"Stephen J. Turnbull" <stephen@xemacs.org> writes:
> In particular, if you run "bzr add"
> with no arguments, everything in the tree that is not already
> versioned and is not listed in .bzrignore will be added.

Hmm, that seems a wee bit dangerous...

-Miles

-- 
Virtues, n. pl. Certain abstentions.

Re: emacs-w3m?

[Andreas Roehler]

Miles Bader wrote:
> "Stephen J. Turnbull" <stephen@xemacs.org> writes:
>> In particular, if you run "bzr add"
>> with no arguments, everything in the tree that is not already
>> versioned and is not listed in .bzrignore will be added.
> 
> Hmm, that seems a wee bit dangerous...
> 
> -Miles
> 

Indeed. As Stephen pointed out,

MY-LOCAL-PATH/tut/vc/bzr-en-html/user-reference/index.html#add
says:

,----
| If no names are given ‘.’ is assumed.
|
| Therefore simply saying ‘bzr add’ will version all files that are currently unknown.
|
| Adding a file whose parent directory is not versioned will implicitly add the parent, and so on up to the root. This means you should never need to explicitly add a directory, they’ll just get added when you add a file in the directory.
`----

Cheers

Andreas

--
https://code.launchpad.net/~a-roehler/python-mode
https://code.launchpad.net/s-x-emacs-werkstatt/

Re: emacs-w3m?

[Andreas Schwab]

bob@gnu.org (Robert J. Chassell) writes:

> As far as I know, the documentation does not recommend a `diff' before
> a `commit' or an `add'.

You do that with _any_ VCS.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: emacs-w3m?

[Eli Zaretskii]

> From: bob@gnu.org (Robert J. Chassell)
> Date: Thu, 25 Feb 2010 21:17:57 -0500
> Cc: emacs-devel@gnu.org
> 
>     >     Definitely, those files were added with `bzr add'. You did it
>     >     inadvertently.
>     >
>     > I did not.
> 
>     Yes, you did. Bazaar does not add files without being told so.
> 
> I really don't think I did more than a `commit' but I cannot remember so
> I am not sure.

No need to argue about that: in your ~/.bzr.log file you will find the
full log of all the Bazaar commands you invoked since the day you
installed Bazaar.  Each command has a time stamp, so you should have
no trouble at all finding the ones you did around the time in
question.

Post here what you find there, and let's see what you did and how to
avoid that in the future.

Re: emacs-w3m?

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <stephen@xemacs.org>
> Date: Fri, 26 Feb 2010 12:59:59 +0900
> Cc: Óscar Fuentes <ofv@wanadoo.es>, emacs-devel@gnu.org
> 
> Maybe the documentation should recommend running "bzr status" before
> committing, at least if you haven't committed within the limits of
> your short-term memory.  This simply lists the files have been changed
> and will be committed, along with a brief description of the change.

There's also the bzr-diffstat plugin, which shows a bit more about the
uncommitted changes than "bzr status".

Re: emacs-w3m?

[Robert J. Chassell]

    ... in your ~/.bzr.log file you will find the
    full log of all the Bazaar commands ...

I had not realized that.  I gave an `add' command but not on the same
day.  It was several days before, on Saturday, the 20th, rather than on
Wednesday, the 24th!  I also have a Python problem for a non-existent
file but that is marked resolved.  (I got Python from Debian and have
not changed it.)  All I did on 24 February was update, merge, resolve,
and commit.

I have both a quickfixes/ directory which is a branch off of trunk where
I made the change to `Introduction to Programming in Emacs Lisp' and a
trunk/, which is the only branch connected to
sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk.

Sat 2010-02-20 12:18:25 +0000
0.195  bzr arguments: [u'add', u'lisp/ChangeLog.OTHER', u'--file-ids-from=sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/']
0.257  looking for plugins in /home/bob/.bazaar/plugins
0.257  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.705  encoding stdout as sys.stdout encoding 'ISO-8859-1'
3.990  bzr-svn: using Subversion 1.6.9 ()
4.396  ssh implementation is OpenSSH
13.054  opening working tree '/usr/local/src/emacs/trunk'
13.362  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 659, in run
    no_recurse, action=action, save=not dry_run)
  File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 53, in tree_write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 399, in smart_add
    kind = osutils.file_kind(abspath)
  File "/usr/lib/python2.5/site-packages/bzrlib/osutils.py", line 1801, in file_kind
    raise errors.NoSuchFile(f)
NoSuchFile: No such file: u'/usr/local/src/emacs/trunk/lisp/ChangeLog.OTHER'

13.363  return code 3

Sat 2010-02-20 12:23:07 +0000
0.164  bzr arguments: [u'merge']
0.228  looking for plugins in /home/bob/.bazaar/plugins
0.228  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.910  opening working tree '/usr/local/src/emacs/quickfixes'
1.613  file:///usr/local/src/emacs/trunk/
[15687] 2010-02-20 12:23:08.910 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
3.291  Base revid: 'eliz@gnu.org-20100220085916-gol7b4ydv7iwm3mh'
[15687] 2010-02-20 12:23:10.588 INFO: Nothing to do.
3.297  return code 0

Sun 2010-02-21 10:48:28 +0000
0.954  bzr arguments: [u'update']
1.262  looking for plugins in /home/bob/.bazaar/plugins
1.262  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
3.940  encoding stdout as sys.stdout encoding 'ISO-8859-1'
4.613  opening working tree '/usr/local/src/emacs/trunk'
7.237  bzr-svn: using Subversion 1.6.9 ()
7.432  ssh implementation is OpenSSH
12.668  Using fetch logic to copy between CHKInventoryRepository('sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/.bzr/repository/')(<RepositoryFormat2a>) and CHKInventoryRepository('file:///usr/local/src/emacs/.bzr/repository/')(<RepositoryFormat2a>)
12.668  fetch up to rev {cyd@stupidchicken.com-20100220141120-xkx3h55kwbuy9f55}
[ 4661] 2010-02-21 10:49:22.889 INFO:  M  lib-src/ChangeLog
[ 4661] 2010-02-21 10:49:22.896 INFO:  M  lib-src/etags.c
[ 4661] 2010-02-21 10:49:22.897 INFO:  M  lisp/ChangeLog
[ 4661] 2010-02-21 10:49:22.898 INFO:  M  lisp/progmodes/compile.el
[ 4661] 2010-02-21 10:49:23.314 INFO: All changes applied successfully.
[ 4661] 2010-02-21 10:49:23.788 INFO: Updated to revision 99540.
55.247  return code 0

Sun 2010-02-21 10:51:07 +0000
0.995  bzr arguments: [u'merge']
1.166  looking for plugins in /home/bob/.bazaar/plugins
1.167  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
7.990  opening working tree '/usr/local/src/emacs/quickfixes'
10.902  file:///usr/local/src/emacs/trunk/
[ 5375] 2010-02-21 10:51:18.883 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
14.384  Base revid: 'eliz@gnu.org-20100220085916-gol7b4ydv7iwm3mh'
[ 5375] 2010-02-21 10:51:28.701 INFO: +N  lisp/ChangeLog.OTHER
[ 5375] 2010-02-21 10:51:28.702 INFO:  M  lib-src/ChangeLog
[ 5375] 2010-02-21 10:51:28.704 INFO:  M  lib-src/etags.c
[ 5375] 2010-02-21 10:51:28.704 INFO:  M  lisp/progmodes/compile.el
[ 5375] 2010-02-21 10:51:28.710 WARNING: Contents conflict in lisp/ChangeLog
[ 5375] 2010-02-21 10:51:28.722 WARNING: Conflict adding file lisp/ChangeLog.OTHER.  Moved existing file to lisp/ChangeLog.OTHER.moved.
[ 5375] 2010-02-21 10:51:28.939 INFO: 2 conflicts encountered.
143.756  return code 1

Sun 2010-02-21 10:53:55 +0000
1.237  bzr arguments: [u'remove', u'lisable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3065, in run
    raise errors.BzrCommandError('Conflicts detected in working '
BzrCommandError: Conflicts detected in working tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.

3.580  return code 3

Sun 2010-02-21 10:55:26 +0000
0.352  bzr arguments: [u'conflicts']
0.429  looking for plugins in /home/bob/.bazaar/plugins
0.429  looking for plugins in /usrlugins
2.940  opening working tree '/usr/local/src/emacs/quickfixes'
3.489  file:///usr/local/src/emacs/trunk/
[ 5943] 2010-02-21 10:56:47.886 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
12.154  Base revid: 'cyd@stupidchicken.com-20100220141120-xkx3h55kwbuy9f55'
[ 5943] 2010-02-21 10:56:57.468 INFO: Nothing to do.
13.848  return code 0

Mon 2010-02-22 10:56:05 +0000
0.898  bzr arguments: [u'update']
1.140  looking for plugins in /home/bob/.bazaar/plugins
1.140  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
3.726  encoding stdout as sys.stdout encoding 'ISO-8859-1'
4.468  opening working tree '/usr/local/src/emacs/trunk'
6.868  bzr-svn: using Subversion 1.6.9 ()
7.127  ssh i01  return code 3

Mon 2010-02-22 11:03:04 +0000
2.866  bzr arguments: [u'missing']
3.646 encoding 'ISO-8859-1'
19.439  Started 2 unique searchers for 44 unique revisions
133.782  return code 1

Mon 2010-02-22 11:05:52 +0000
0.681  bzr arguments: [u'merge']
0.873  looking for plugins in /home/bob/.bazaar/plugins
0.873  looking for plugins in /usr/lib/python2.5/site-packagocal/src/emacs/trunk/
[15662] 2010-02-22 11:05:57.438 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
6.505  Base revid: 'cyd@stupidchicken.com-20100220141120-xkx3h55kwbuy9f55'
[15662] 2010-02-22 11:06:06.213 INFO: +N  lisp/ChangeLog.OTHER
[15662] 2010-02-22 11:06:06.214 INFO:  M  doc/emacs/ChangeLog
[15662] 2010-02-22 11:06:06.215 INFO:  M  doc/emacs/frames.texi
[15662] 2010-02-22 11:06:06.216 INFO:  M  lisp/eshell/eshell.el
[15662] 2010-02-22 11:06:06.217 INFO:  M  lisp/files.el
[15662] 2010-02-22 11:06:06.218 INFO:  M  lisp/htmlfontify.el
[15662] 2010-02-22 11:06:06.219 INFO:  M  lisp/startup.el
[15662] 2010-02-22 11:06:06.220 INFO:  M  src/ChangeLog
[15662] 2010-02-22 11:06:06.221 INFO:  M  src/m/arm.h
[15662] 2010-02-22 11:06:06.222 WARNING: Contents conflict in lisp/ChangeLog
[15662] 2010-02-22 11:06:06.664 INFO: 1 conflicts encountered.
91.823  return code 1

Mon 2010-02-22 11:09:00 +0000
0.208  bzr arguments: [u'resolve', u'lisp/ChangeLog']
0.277  looking for plugins in /home/bob/.bazaar/plugins
0.278  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.793  encoding stdout as sys.stdout encoding 'ISO-8859-1'
1.034  opening working tree '/usr/local/src/emacs/quickfixes'
1.216  return code 0

Mon 2010-02-22 11:09:10 +0000
0.187  bzr arguments: [u'commit', u'-m2010-02-22']
0.255  looking for plugins in /home/bob/.bazaar/plugins
0.256  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.728  encoding stdout as sys.stdout encoding 'ISO-8859-1'
1.085  opening working tree '/usr/local/src/emacs/quickfixes'
1.205  preparing to commit
[15793] 2010-02-22 11:09:11.552 INFO: Committing to: /usr/local/src/emacs/quickfixes/
1.352  Selecting files for commit with filter None
[15793] 2010-02-22 11:09:13.188 INFO: modified doc/emacs/ChangeLog
[15793] 2010-02-22 11:09:13.195 INFO: modified doc/emacs/frames.texi
[15793] 2010-02-22 11:09:13.368 INFO: missing lisp/ChangeLog.OTHER
[15793] 2010-02-22 11:09:13.397 INFO: modified lisp/files.el
[15793] 2010-02-22 11:09:13.412 INFO: modified lisp/htmlfontify.el
[15793] 2010-02-22 11:09:13.437 INFO: modified lisp/startup.el
[15793] 2010-02-22 11:09:13.499 INFO: modified lisp/eshell/eshell.el
[15793] 2010-02-22 11:09:13.647 INFO: modified src/ChangeLog
[15793] 2010-02-22 11:09:13.674 INFO: modified src/m/arm.h
[15793] 2010-02-22 11:09:17.256 INFO: Committed revision 99238.
7.291  return code 0

Mon 2010-02-22 11:10:43 +0000
0.198  bzr arguments: [u'merge']
0.268  looking for plugins in /home/bob/.bazaar/plugins
0.268  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.975  opening working tree '/usr/local/src/emacs/quickfixes'
1.529  file:///usr/local/src/emacs/trunk/
[15884] 2010-02-22 11:10:45.516 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
2.963  Base revid: 'cyd@stupidchicken.com-20100221211246-i6nketjrj58mq1qt'
[15884] 2010-02-22 11:10:46.947 INFO: Nothing to do.
2.968  return code 0

Tue 2010-02-23 11:06:24 +0000
1.298  bzr arguments: [u'update']
1.593  looking for plugins in /home/bob/.bazaar/plugins
1.594  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
4.933  encoding stdout as sys.stdout encoding 'ISO-8859-1'
5.952  opening working tree '/usr/local/src/emacs/trunk'
8.816  bzr-svn: using Subversion 1.6.9 ()
9.806  ssh implementation is OpenSSH
15.514  Using fetch logic to copy between CHKInventoryRepository('sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/.bzr/repository/')(<RepositoryFormat2a>) and CHKInventoryRepository('file:///usr/local/src/emacs/.bzr/repository/')(<RepositoryFormat2a>)
15.761  fetch up to rev {rgm@gnu.org-20100223043816-7wuq6xi9qf1kayz4}
[ 5733] 2010-02-23 11:07:30.240 INFO:  M  lisp/ChangeLog
[ 5733] 2010-02-23 11:07:30.288 INFO:  M  lisp/net/tramp.el
[ 5733] 2010-02-23 11:07:30.325 INFO:  M  lisp/nxml/TODO
[ 5733] 2010-02-23 11:07:30.595 INFO: All changes applied successfully.
[ 5733] 2010-02-23 11:07:31.115 INFO: Updated to revision 99547.
66.756  return code 0

Tue 2010-02-23 11:14:15 +0000
6.522  bzr arguments: [u'merge']
7.679  looking for plugins in /home/bob/.bazaar/plugins
7.679  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
16.984  opening working tree '/usr/local/src/emacs/quickfixes'
19.855  file:///usr/local/src/emacs/trunk/
[ 7343] 2010-02-23 11:14:35.691 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
26.170  Base revid: 'cyd@stupidchicken.com-20100221211246-i6nketjrj58mq1qt'
[ 7343] 2010-02-23 11:14:51.692 INFO: +N  lisp/ChangeLog.OTHER
[ 7343] 2010-02-23 11:14:51.693 INFO:  M  lisp/net/tramp.el
[ 7343] 2010-02-23 11:14:51.694 INFO:  M  lisp/nxml/TODO
[ 7343] 2010-02-23 11:14:51.696 WARNING: Contents conflict in lisp/ChangeLog
[ 7343] 2010-02-23 11:14:51.979 INFO: 1 conflicts encountered.
169.682  return code 1

Tue 2010-02-23 11:19:06 +0000
0.941  bzr arguments: [u'resolve', u'lisp/ChangeLog']
1.247  looking for plugins in /home/bob/.bazaar/plugins
1.247  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
3.815  encoding stdout as sys.stdout encoding 'ISO-8859-1'
4.573  opening working tree '/usr/local/src/emacs/quickfixes'
4.872  return code 0

Tue 2010-02-23 11:19:21 +0000
0.178  bzr arguments: [u'commit', u'-m2010-02-23']
0.238  looking for plugins in /home/bob/.bazaar/plugins
0.239  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.653  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.981  opening working tree '/usr/local/src/emacs/quickfixes'
1.058  preparing to commit
[ 8313] 2010-02-23 11:19:23.058 INFO: Committing to: /usr/local/src/emacs/quickfixes/
1.194  Selecting files for commit with filter None
[ 8313] 2010-02-23 11:19:25.925 INFO: missing lisp/ChangeLog.OTHER
[ 8313] 2010-02-23 11:19:26.333 INFO: modified lisp/net/tramp.el
[ 8313] 2010-02-23 11:19:26.360 INFO: modified lisp/nxml/TODO
[ 8313] 2010-02-23 11:19:30.075 INFO: Committed revision 99239.
8.414  return code 0

Tue 2010-02-23 11:22:26 +0000
0.274  bzr arguments: [u'merge']
0.335  looking for plugins in /home/bob/.bazaar/plugins
0.335  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
1.404  opening working tree '/usr/local/src/emacs/quickfixes'
1.863  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3667, in run
    raise errors.UncommittedChanges(tree)
UncommittedChanges: Working tree "/usr/local/src/emacs/quickfixes/" has uncommitted changes (See bzr status).

1.863  return code 3

Tue 2010-02-23 11:22:37 +0000
0.169  bzr arguments: [u'commit', u'-m2010-02-23']
0.232  looking for plugins in /home/bob/.bazaar/plugins
0.233  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.642  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.852  opening working tree '/usr/local/src/emacs/quickfixes'
0.906  preparing to commit
[11932] 2010-02-23 11:22:39.020 INFO: Committing to: /usr/local/src/emacs/quickfixes/
1.047  Selecting files for commit with filter None
[11932] 2010-02-23 11:22:39.219 INFO: modified .bzrignore
1.823  Auto-packing repository <bzrlib.repofmt.groupcompress_repo.GCRepositoryPackCollection object at 0x9774bac>, which has 16 pack files, containing 107250 revisions. Packing 12 files into 1 affecting 27 revisions
1.827  repacking 27 revisions
1.961  repacking 27 inventories
2.014  repacking chk: 27 id_to_entry roots, 2 p_id_map roots, 78 total keys
2.317  repacking 45 texts
6.720  repacking 0 signatures
7.071  Auto-packing repository <bzrlib.repofmt.groupcompress_repo.GCRepositoryPackCollection object at 0x9774bac> completed
[11932] 2010-02-23 11:22:45.198 INFO: Committed revision 99240.
7.422  return code 0

Tue 2010-02-23 11:22:48 +0000
0.167  bzr arguments: [u'merge']
0.234  looking for plugins in /home/bob/.bazaar/plugins
0.234  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.910  opening working tree '/usr/local/src/emacs/quickfixes'
1.615  file:///usr/local/src/emacs/trunk/
[11937] 2010-02-23 11:22:50.474 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
3.047  Base revid: 'rgm@gnu.org-20100223043816-7wuq6xi9qf1kayz4'
[11937] 2010-02-23 11:22:51.905 INFO: Nothing to do.
3.053  return code 0

Wed 2010-02-24 11:21:40 +0000
0.913  bzr arguments: [u'update']
1.129  looking for plugins in /home/bob/.bazaar/plugins
1.129  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
3.537  encoding stdout as sys.stdout encoding 'ISO-8859-1'
4.291  opening working tree '/usr/local/src/emacs/trunk'
5.962  bzr-svn: using Subversion 1.6.9 ()
6.147  ssh implementation is OpenSSH
10.150  Using fetch logic to copy between CHKInventoryRepository('sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/.bzr/repository/')(<RepositoryFormat2a>) and CHKInventoryRepository('file:///usr/local/src/emacs/.bzr/repository/')(<RepositoryFormat2a>)
10.151  fetch up to rev {rgm@gnu.org-20100224031254-k4j37la74pew76l2}
[ 6954] 2010-02-24 11:22:27.083 INFO:  M  lisp/gnus/ChangeLog
[ 6954] 2010-02-24 11:22:27.085 INFO:  M  lisp/gnus/message.el
[ 6954] 2010-02-24 11:22:27.261 INFO: All changes applied successfully.
[ 6954] 2010-02-24 11:22:27.714 INFO: Updated to revision 99548.
47.314  return code 0

Wed 2010-02-24 11:25:52 +0000
4.771  bzr arguments: [u'merge']
5.789  looking for plugins in /home/bob/.bazaar/plugins
5.790  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
21.350  opening working tree '/usr/local/src/emacs/quickfixes'
28.268  file:///usr/local/src/emacs/trunk/
[ 7475] 2010-02-24 11:26:21.164 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
39.957  Base revid: 'rgm@gnu.org-20100223043816-7wuq6xi9qf1kayz4'
[ 7475] 2010-02-24 11:26:58.119 INFO:  M  lisp/gnus/ChangeLog
[ 7475] 2010-02-24 11:26:58.120 INFO:  M  lisp/gnus/message.el
[ 7475] 2010-02-24 11:26:58.706 INFO: All changes applied successfully.
205.003  return code 0

Wed 2010-02-24 14:07:15 +0000
0.930  bzr arguments: [u'push', u'sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/']
1.203  looking for plugins in /home/bob/.bazaar/plugins
1.203  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
3.907  encoding stdout as sys.stdout encoding 'ISO-8859-1'
4.601  opening working tree '/usr/local/src/emacs/quickfixes'
5.419  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 1115, in run
    tree, more='Use --no-strict to force the push.')
UncommittedChanges: Working tree "/usr/local/src/emacs/quickfixes/" has uncommitted changes (See bzr status). Use --no-strict to force the push.

5.420  return code 3

Wed 2010-02-24 14:07:57 +0000
0.208  bzr arguments: [u'commit', u'-m2010-02-23']
0.268  looking for plugins in /home/bob/.bazaar/plugins
0.269  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.679  encoding stdout as sys.stdout encoding 'ISO-8859-1'
1.005  opening working tree '/usr/local/src/emacs/quickfixes'
1.095  preparing to commit
[19800] 2010-02-24 14:07:59.166 INFO: Committing to: /usr/local/src/emacs/quickfixes/
1.246  Selecting files for commit with filter None
[19800] 2010-02-24 14:08:00.806 INFO: modified doc/lispintro/emacs-lisp-intro.texi
[19800] 2010-02-24 14:08:02.432 INFO: modified lisp/gnus/ChangeLog
[19800] 2010-02-24 14:08:02.471 INFO: modified lisp/gnus/message.el
[19800] 2010-02-24 14:08:07.057 INFO: Committed revision 99241.
9.329  return code 0

Wed 2010-02-24 14:08:21 +0000
0.176  bzr arguments: [u'push', u'sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/']
0.238  looking for plugins in /home/bob/.bazaar/plugins
0.238  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.673  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.885  opening working tree '/usr/local/src/emacs/quickfixes'
3.981  bzr-svn: using Subversion 1.6.9 ()
4.343  ssh implementation is OpenSSH

Wed 2010-02-24 20:27:13 +0000
0.488  bzr arguments: [u'whoami']
0.619  looking for plugins in /home/bob/.bazaar/plugins
0.619  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
1.778  encoding stdout as sys.stdout encoding 'ISO-8859-1'
1.847  return code 0

Wed 2010-02-24 21:22:56 +0000
0.244  bzr arguments: [u'merge', u'/usr/local/src/emacs/quickfixes/']
0.313  looking for plugins in /home/bob/.bazaar/plugins
0.313  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
1.901  opening working tree '/usr/local/src/emacs/trunk'
2.426  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3667, in run
    raise errors.UncommittedChanges(tree)
UncommittedChanges: Working tree "/usr/local/src/emacs/trunk/" has uncommitted changes (See bzr status).

2.427  return code 3

Wed 2010-02-24 21:23:31 +0000
0.454  bzr arguments: [u'update']
0.522  looking for plugins in /home/bob/.bazaar/plugins
0.522  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
1.007  encoding stdout as sys.stdout encoding 'ISO-8859-1'
1.237  opening working tree '/usr/local/src/emacs/trunk'
4.330  bzr-svn: using Subversion 1.6.9 ()
4.710  ssh implementation is OpenSSH
8.607  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 1394, in run
    possible_transports=possible_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 2371, in get_master_branch
    self, bound_loc, e)
BoundBranchConnectionFailure: Unable to connect to target of bound branch BzrBranch7('file:///usr/local/src/emacs/trunk/') => sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/: Unable to connect to SSH host bzr.savannah.gnu.org; EOF during negotiation

8.609  return code 3

Wed 2010-02-24 21:24:10 +0000
0.200  bzr arguments: [u'update']
0.271  looking for plugins in /home/bob/.bazaar/plugins
0.271  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.732  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.960  opening working tree '/usr/local/src/emacs/trunk'
1.391  bzr-svn: using Subversion 1.6.9 ()
1.484  ssh implementation is OpenSSH
6.529  Using fetch logic to copy between CHKInventoryRepository('sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/.bzr/repository/')(<RepositoryFormat2a>) and CHKInventoryRepository('file:///usr/local/src/emacs/.bzr/repository/')(<RepositoryFormat2a>)
6.530  fetch up to rev {jan.h.d@swipnet.se-20100224182544-xt99hogpdg3shhh5}
[13949] 2010-02-24 21:25:03.731 INFO:  M  lisp/ChangeLog
[13949] 2010-02-24 21:25:03.733 INFO:  M  lisp/cedet/semantic/wisent/javascript.el
[13949] 2010-02-24 21:25:03.734 INFO:  M  lisp/files.el
[13949] 2010-02-24 21:25:03.735 INFO:  M  lisp/gnus/ChangeLog
[13949] 2010-02-24 21:25:03.736 INFO:  M  lisp/gnus/gnus-art.el
[13949] 2010-02-24 21:25:03.737 INFO:  M  src/ChangeLog
[13949] 2010-02-24 21:25:03.738 INFO:  M  src/gtkutil.c
[13949] 2010-02-24 21:25:03.739 INFO:  M  src/xterm.c
[13949] 2010-02-24 21:25:04.147 INFO: All changes applied successfully.
[13949] 2010-02-24 21:25:04.679 INFO: Updated to revision 99552.
54.763  return code 0

Wed 2010-02-24 21:45:16 +0000
0.685  bzr arguments: [u'commit', u'-m2010-02-24']
1.091  looking for plugins in /home/bob/.bazaar/plugins
1.092  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
1.858  encoding stdout as sys.stdout encoding 'ISO-8859-1'
2.227  opening working tree '/usr/local/src/emacs/trunk'
3.331  bzr-svn: using Subversion 1.6.9 ()
3.516  ssh implementation is OpenSSH
6.714  preparing to commit
6.740  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3065, in run
    raise errors.BzrCommandError('Conflicts detected in working '
BzrCommandError: Conflicts detected in working tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.

6.741  return code 3

Wed 2010-02-24 21:45:38 +0000
0.160  bzr arguments: [u'conflicts']
0.228  looking for plugins in /home/bob/.bazaar/plugins
0.228  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.653  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.848  opening working tree '/usr/local/src/emacs/trunk'
0.868  return code 0

Wed 2010-02-24 21:46:43 +0000
0.161  bzr arguments: [u'rm', u'configure.BASE.moved']
0.224  looking for plugins in /home/bob/.bazaar/plugins
0.224  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.627  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.833  opening working tree '/usr/local/src/emacs/trunk'
[15594] 2010-02-24 21:46:44.376 INFO: configure.BASE.moved does not exist.
1.148  return code 0

Wed 2010-02-24 21:47:46 +0000
0.160  bzr arguments: [u'commit', u'-m2010-02-24']
0.219  looking for plugins in /home/bob/.bazaar/plugins
0.219  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.625  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.846  opening working tree '/usr/local/src/emacs/trunk'
1.253  bzr-svn: using Subversion 1.6.9 ()
1.347  ssh implementation is OpenSSH
4.053  preparing to commit
4.078  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3065, in run
    raise errors.BzrCommandError('Conflicts detected in working '
BzrCommandError: Conflicts detected in working tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.

4.079  return code 3

Wed 2010-02-24 21:48:14 +0000
0.162  bzr arguments: [u'resolve', u'configure.BASE.moved']
0.221  looking for plugins in /home/bob/.bazaar/plugins
0.222  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.648  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.846  opening working tree '/usr/local/src/emacs/trunk'
0.976  return code 0

Wed 2010-02-24 21:49:49 +0000
0.185  bzr arguments: [u'resolve', u'configure.BASE.moved.moved', u'configure.OTHER.moved', u'configure.OTHER.moved.moved', u'configure.THIS.moved', u'configure.THIS.moved.moved']
0.241  looking for plugins in /home/bob/.bazaar/plugins
0.241  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.643  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.859  opening working tree '/usr/local/src/emacs/trunk'
1.057  return code 0

Wed 2010-02-24 21:50:10 +0000
0.158  bzr arguments: [u'merge', u'/usr/local/src/emacs/quickfixes/']
0.220  looking for plugins in /home/bob/.bazaar/plugins
0.220  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.846  opening working tree '/usr/local/src/emacs/trunk'
0.985  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3667, in run
    raise errors.UncommittedChanges(tree)
UncommittedChanges: Working tree "/usr/local/src/emacs/trunk/" has uncommitted changes (See bzr status).

0.986  return code 3

Wed 2010-02-24 21:50:20 +0000
0.158  bzr arguments: [u'commit', u'-m2010-02-24']
0.221  looking for plugins in /home/bob/.bazaar/plugins
0.221  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.625  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.831  opening working tree '/usr/local/src/emacs/trunk'
1.254  bzr-svn: using Subversion 1.6.9 ()
1.352  ssh implementation is OpenSSH
4.012  preparing to commit
4.036  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3065, in run
    raise errors.BzrCommandError('Conflicts detected in working '
BzrCommandError: Conflicts detected in working tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.

4.037  return code 3

Wed 2010-02-24 21:50:41 +0000
0.162  bzr arguments: [u'resolve', u'configure.BASE.moved.moved']
0.224  looking for plugins in /home/bob/.bazaar/plugins
0.225  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.629  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.825  opening working tree '/usr/local/src/emacs/trunk'
0.967  return code 0

Wed 2010-02-24 21:51:22 +0000
0.168  bzr arguments: [u'update']
0.228  looking for plugins in /home/bob/.bazaar/plugins
0.228  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.631  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.822  opening working tree '/usr/local/src/emacs/trunk'
1.221  bzr-svn: using Subversion 1.6.9 ()
1.305  ssh implementation is OpenSSH
[15752] 2010-02-24 21:51:26.673 INFO: Tree is up to date at revision 99552.
3.823  return code 0

Wed 2010-02-24 21:52:03 +0000
0.156  bzr arguments: [u'commit', u'-m2010-02-24']
0.214  looking for plugins in /home/bob/.bazaar/plugins
0.214  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.612  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.809  opening working tree '/usr/local/src/emacs/trunk'
1.208  bzr-svn: using Subversion 1.6.9 ()
1.303  ssh implementation is OpenSSH
1.356  Could not connect to bound branch, falling back to local nick.
 Unable to connect to target of bound branch BzrBranch7('file:///usr/local/src/emacs/trunk/') => sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/: Unable to connect to SSH host bzr.savannah.gnu.org; EOF during negotiation
1.359  preparing to commit
1.398  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3065, in run
    raise errors.BzrCommandError('Conflicts detected in working '
BzrCommandError: Conflicts detected in working tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.

1.399  return code 3

Wed 2010-02-24 21:52:22 +0000
0.149  bzr arguments: [u'resolve', u'configure.BASE.moved.moved']
0.209  looking for plugins in /home/bob/.bazaar/plugins
0.210  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.597  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.796  opening working tree '/usr/local/src/emacs/trunk'
0.921  return code 0

Wed 2010-02-24 21:52:29 +0000
0.153  bzr arguments: [u'resolve', u'configure.BASE.moved']
0.213  looking for plugins in /home/bob/.bazaar/plugins
0.214  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.621  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.807  opening working tree '/usr/local/src/emacs/trunk'
0.950  return code 0

Wed 2010-02-24 21:52:41 +0000
0.162  bzr arguments: [u'resolve', u'configure']
0.223  looking for plugins in /home/bob/.bazaar/plugins
0.223  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.608  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.792  opening working tree '/usr/local/src/emacs/trunk'
0.986  return code 0

Wed 2010-02-24 21:52:47 +0000
0.151  bzr arguments: [u'commit', u'-m2010-02-24']
0.211  looking for plugins in /home/bob/.bazaar/plugins
0.211  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.611  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.818  opening working tree '/usr/local/src/emacs/trunk'
1.211  bzr-svn: using Subversion 1.6.9 ()
1.303  ssh implementation is OpenSSH
1.370  Could not connect to bound branch, falling back to local nick.
 Unable to connect to target of bound branch BzrBranch7('file:///usr/local/src/emacs/trunk/') => sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/: Unable to connect to SSH host bzr.savannah.gnu.org; EOF during negotiation
1.373  preparing to commit
1.569  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3058, in run
    exclude=safe_relpath_files(tree, exclude))
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 197, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 229, in commit
    *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 305, in commit
    self._check_bound_branch(possible_master_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 448, in _check_bound_branch
    possible_master_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 2371, in get_master_branch
    self, bound_loc, e)
BoundBranchConnectionFailure: Unable to connect to target of bound branch BzrBranch7('file:///usr/local/src/emacs/trunk/') => sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/: Unable to connect to SSH host bzr.savannah.gnu.org; EOF during negotiation

1.571  return code 3

Wed 2010-02-24 22:07:19 +0000
0.161  bzr arguments: [u'commit', u'-m', u'Merge: add word to sentence in trunk/doc/lispintro/emacs-lisp-intro.texi, in section Finding More Information']
0.219  looking for plugins in /home/bob/.bazaar/plugins
0.220  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.640  encoding stdout as sys.stdout encoding 'ISO-8859-1'
0.841  opening working tree '/usr/local/src/emacs/trunk'
1.240  bzr-svn: using Subversion 1.6.9 ()
1.334  ssh implementation is OpenSSH
4.029  preparing to commit
[16788] 2010-02-24 22:07:26.190 INFO: Committing to: sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/
6.663  Selecting files for commit with filter None
[16788] 2010-02-24 22:07:26.368 INFO: modified configure
[16788] 2010-02-24 22:07:26.370 INFO: missing configure.BASE
[16788] 2010-02-24 22:07:26.371 INFO: missing configure.OTHER
[16788] 2010-02-24 22:07:26.373 INFO: missing configure.THIS
[16788] 2010-02-24 22:07:26.440 INFO: added log-n0.out
[16788] 2010-02-24 22:07:26.457 INFO: added share
[16788] 2010-02-24 22:07:27.382 INFO: modified doc/lispintro/emacs-lisp-intro.texi
[16788] 2010-02-24 22:07:40.696 INFO: added share/emacs
[16788] 2010-02-24 22:07:40.697 INFO: added share/info
[16788] 2010-02-24 22:07:40.700 INFO: added share/emacs/site-lisp
[16788] 2010-02-24 22:07:40.702 INFO: added share/emacs/site-lisp/w3m
[16788] 2010-02-24 22:07:40.730 INFO: added share/emacs/site-lisp/w3m/ChangeLog
[16788] 2010-02-24 22:07:40.732 INFO: added share/emacs/site-lisp/w3m/ChangeLog.1
[16788] 2010-02-24 22:07:40.733 INFO: added share/emacs/site-lisp/w3m/mew-w3m.el
[16788] 2010-02-24 22:07:40.735 INFO: added share/emacs/site-lisp/w3m/mime-w3m.el
[16788] 2010-02-24 22:07:40.736 INFO: added share/emacs/site-lisp/w3m/octet.el
[16788] 2010-02-24 22:07:40.737 INFO: added share/emacs/site-lisp/w3m/w3m-antenna.el
[16788] 2010-02-24 22:07:40.739 INFO: added share/emacs/site-lisp/w3m/w3m-bookmark.el
[16788] 2010-02-24 22:07:40.740 INFO: added share/emacs/site-lisp/w3m/w3m-bug.el
[16788] 2010-02-24 22:07:40.742 INFO: added share/emacs/site-lisp/w3m/w3m-ccl.el
[16788] 2010-02-24 22:07:40.743 INFO: added share/emacs/site-lisp/w3m/w3m-cookie.el
[16788] 2010-02-24 22:07:40.745 INFO: added share/emacs/site-lisp/w3m/w3m-dtree.el
[16788] 2010-02-24 22:07:40.746 INFO: added share/emacs/site-lisp/w3m/w3m-ems.el
[16788] 2010-02-24 22:07:40.748 INFO: added share/emacs/site-lisp/w3m/w3m-favicon.el
[16788] 2010-02-24 22:07:40.749 INFO: added share/emacs/site-lisp/w3m/w3m-fb.el
[16788] 2010-02-24 22:07:40.751 INFO: added share/emacs/site-lisp/w3m/w3m-filter.el
[16788] 2010-02-24 22:07:40.752 INFO: added share/emacs/site-lisp/w3m/w3m-form.el
[16788] 2010-02-24 22:07:40.754 INFO: added share/emacs/site-lisp/w3m/w3m-hist.el
[16788] 2010-02-24 22:07:40.755 INFO: added share/emacs/site-lisp/w3m/w3m-image.el
[16788] 2010-02-24 22:07:40.757 INFO: added share/emacs/site-lisp/w3m/w3m-lnum.el
[16788] 2010-02-24 22:07:40.758 INFO: added share/emacs/site-lisp/w3m/w3m-load.el
[16788] 2010-02-24 22:07:40.760 INFO: added share/emacs/site-lisp/w3m/w3m-mail.el
[16788] 2010-02-24 22:07:40.761 INFO: added share/emacs/site-lisp/w3m/w3m-namazu.el
[16788] 2010-02-24 22:07:40.762 INFO: added share/emacs/site-lisp/w3m/w3m-perldoc.el
[16788] 2010-02-24 22:07:40.764 INFO: added share/emacs/site-lisp/w3m/w3m-proc.el
[16788] 2010-02-24 22:07:40.765 INFO: added share/emacs/site-lisp/w3m/w3m-rss.el
[16788] 2010-02-24 22:07:40.767 INFO: added share/emacs/site-lisp/w3m/w3m-search.el
[16788] 2010-02-24 22:07:40.768 INFO: added share/emacs/site-lisp/w3m/w3m-session.el
[16788] 2010-02-24 22:07:40.770 INFO: added share/emacs/site-lisp/w3m/w3m-symbol.el
[16788] 2010-02-24 22:07:40.771 INFO: added share/emacs/site-lisp/w3m/w3m-tabmenu.el
[16788] 2010-02-24 22:07:40.773 INFO: added share/emacs/site-lisp/w3m/w3m-ucs.el
[16788] 2010-02-24 22:07:40.774 INFO: added share/emacs/site-lisp/w3m/w3m-util.el
[16788] 2010-02-24 22:07:40.779 INFO: added share/emacs/site-lisp/w3m/w3m-weather.el
[16788] 2010-02-24 22:07:40.781 INFO: added share/emacs/site-lisp/w3m/w3m.el
[16788] 2010-02-24 22:07:40.806 INFO: added share/info/emacs-w3m-ja.info
[16788] 2010-02-24 22:07:40.808 INFO: added share/info/emacs-w3m.info
36.770  Using fetch logic to copy between CHKInventoryRepository('file:///usr/local/src/emacs/.bzr/repository/')(<RepositoryFormat2a>) and CHKInventoryRepository('sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/.bzr/repository/')(<RepositoryFormat2a>)
36.771  fetch up to rev {bob@gnu.org-20100224220726-30lwnskvsc3pi2nf}
[16788] 2010-02-24 22:12:01.145 INFO: Committed revision 99553.
282.199  return code 0

Then later, I invoked `bzr help remove' (presumably, I learned that I
had inadvertently added W3M mode files to the master copy) but have
not done any removes.

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[Óscar Fuentes]

bob@gnu.org (Robert J. Chassell) writes:

>     >  How do I commit one file?
>
>     That's explained on
>
>     http://www.emacswiki.org/emacs/BzrQuickStartForEmacsDevs
>
> Actually, it does not that I found,

Search for for the occurrences of `bzr commit'. It is not explicitly
mentioned, but it is implicit on the examples.

And registering files into Version Control and checking the changes
before commit is the same as the previous CVS practice.

Re: emacs-w3m?

[Eli Zaretskii]

> Cc: ofv@wanadoo.es, emacs-devel@gnu.org
> From: bob@gnu.org (Robert J. Chassell)
> Date: Fri, 26 Feb 2010 06:47:47 -0500
> 
>     ... in your ~/.bzr.log file you will find the
>     full log of all the Bazaar commands ...
> 
> I had not realized that.  I gave an `add' command but not on the same
> day.  It was several days before, on Saturday, the 20th, rather than on
> Wednesday, the 24th!  I also have a Python problem for a non-existent
> file but that is marked resolved.  (I got Python from Debian and have
> not changed it.)  All I did on 24 February was update, merge, resolve,
> and commit.

I'm not an expert, but it looks like something else is at work here.
See below.

> I have both a quickfixes/ directory which is a branch off of trunk where
> I made the change to `Introduction to Programming in Emacs Lisp' and a
> trunk/, which is the only branch connected to
> sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk.

Maybe you should describe your day-to-day routine workflow with making
changes, because the log you posted has some weird entries (or maybe
I'm not interpreting it correctly).

> I also have a Python problem for a non-existent file but that is
> marked resolved.

I don't see any Python problem.  If you mean this:

> 13.362  Traceback (most recent call last):
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
>     return the_callable(*args, **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
>     ret = run(*run_argv)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
>     return self.run(**all_cmd_args)
>   File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 659, in run
>     no_recurse, action=action, save=not dry_run)
>   File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 53, in tree_write_locked
>     return unbound(self, *args, **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 399, in smart_add
>     kind = osutils.file_kind(abspath)
>   File "/usr/lib/python2.5/site-packages/bzrlib/osutils.py", line 1801, in file_kind
>     raise errors.NoSuchFile(f)
> NoSuchFile: No such file: u'/usr/local/src/emacs/trunk/lisp/ChangeLog.OTHER'
> 
> 13.363  return code 3

Then it's just a symptom of a larger disaster.  All it says is that
you did a "bzr add" for a file that did not exist.

Btw, why did you use "bzr add" in this case?  That command exists only
for adding new files.  Why did you think you had some new file to add
on your end?

> Sat 2010-02-20 12:18:25 +0000
> 0.195  bzr arguments: [u'add', u'lisp/ChangeLog.OTHER', u'--file-ids-from=sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/']

Why did you use the --file-ids-from= option here?  That's hardly
something a simple workflow should include.

Anyway, AFAIK, this cannot be the culprit: it only tries to add a
single file, lisp/ChangeLog.OTHER.  However, the mere presence of the
.OTHER file, and also other similar files:

> [16788] 2010-02-24 22:07:26.370 INFO: missing configure.BASE
> [16788] 2010-02-24 22:07:26.371 INFO: missing configure.OTHER
> [16788] 2010-02-24 22:07:26.373 INFO: missing configure.THIS

is by itself an evidence that you have conflicts in your working tree
that you didn't resolve in time.  I'm guessing that somehow emacs-w3m
got merged with the trunk, because these .BASE, .THIS, and .OTHER
files are created by Bazaar when it detects conflicts during a merge.

Look here, for example:

> Sun 2010-02-21 10:51:07 +0000
> 0.995  bzr arguments: [u'merge']
> 1.166  looking for plugins in /home/bob/.bazaar/plugins
> 1.167  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
> 7.990  opening working tree '/usr/local/src/emacs/quickfixes'
> 10.902  file:///usr/local/src/emacs/trunk/
> [ 5375] 2010-02-21 10:51:18.883 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
> 14.384  Base revid: 'eliz@gnu.org-20100220085916-gol7b4ydv7iwm3mh'
> [ 5375] 2010-02-21 10:51:28.701 INFO: +N  lisp/ChangeLog.OTHER
> [ 5375] 2010-02-21 10:51:28.702 INFO:  M  lib-src/ChangeLog
> [ 5375] 2010-02-21 10:51:28.704 INFO:  M  lib-src/etags.c
> [ 5375] 2010-02-21 10:51:28.704 INFO:  M  lisp/progmodes/compile.el
> [ 5375] 2010-02-21 10:51:28.710 WARNING: Contents conflict in lisp/ChangeLog
> [ 5375] 2010-02-21 10:51:28.722 WARNING: Conflict adding file lisp/ChangeLog.OTHER.  Moved existing file to lisp/ChangeLog.OTHER.moved.
> [ 5375] 2010-02-21 10:51:28.939 INFO: 2 conflicts encountered.
> 143.756  return code 1

Those messages about conflicts were surely displayed to you -- did you
see them?  You should have taken care of these conflicts right away.

Or this:

> Sun 2010-02-21 10:53:55 +0000
> 1.237  bzr arguments: [u'remove', u'lisable(*args, **kwargs)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
>     ret = run(*run_argv)
>   File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
>     return self.run(**all_cmd_args)
>   File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3065, in run
>     raise errors.BzrCommandError('Conflicts detected in working '
> BzrCommandError: Conflicts detected in working tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.

You were supposed to resolve the conflicts, but I don't see any signs
that they were resolved.

> Mon 2010-02-22 11:05:52 +0000
> 0.681  bzr arguments: [u'merge']
> 0.873  looking for plugins in /home/bob/.bazaar/plugins
> 0.873  looking for plugins in /usr/lib/python2.5/site-packagocal/src/emacs/trunk/
> [15662] 2010-02-22 11:05:57.438 INFO: Merging from remembered parent location /usr/local/src/emacs/trunk/
> 6.505  Base revid: 'cyd@stupidchicken.com-20100220141120-xkx3h55kwbuy9f55'
> [15662] 2010-02-22 11:06:06.213 INFO: +N  lisp/ChangeLog.OTHER
> [15662] 2010-02-22 11:06:06.214 INFO:  M  doc/emacs/ChangeLog
> [15662] 2010-02-22 11:06:06.215 INFO:  M  doc/emacs/frames.texi
> [15662] 2010-02-22 11:06:06.216 INFO:  M  lisp/eshell/eshell.el
> [15662] 2010-02-22 11:06:06.217 INFO:  M  lisp/files.el
> [15662] 2010-02-22 11:06:06.218 INFO:  M  lisp/htmlfontify.el
> [15662] 2010-02-22 11:06:06.219 INFO:  M  lisp/startup.el
> [15662] 2010-02-22 11:06:06.220 INFO:  M  src/ChangeLog
> [15662] 2010-02-22 11:06:06.221 INFO:  M  src/m/arm.h
> [15662] 2010-02-22 11:06:06.222 WARNING: Contents conflict in lisp/ChangeLog
> [15662] 2010-02-22 11:06:06.664 INFO: 1 conflicts encountered.
> 91.823  return code 1
> 
> Mon 2010-02-22 11:09:00 +0000
> 0.208  bzr arguments: [u'resolve', u'lisp/ChangeLog']
> 0.277  looking for plugins in /home/bob/.bazaar/plugins
> 0.278  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
> 0.793  encoding stdout as sys.stdout encoding 'ISO-8859-1'
> 1.034  opening working tree '/usr/local/src/emacs/quickfixes'
> 1.216  return code 0

It doesn't help using "bzr resolve" if you don't resolve the conflicts
before that.  The resolution is a manual job.  It looks to me that
Bazaar displayed warning and error messages about conflicts time and
again, but you did not resolve the conflicts correctly.  You should
have asked for help right there and then.

And it is certainly a no-no to commit to the public repository when
you have a tree of dubious quality, one where you get error messages
about conflicts you cannot explain.

> Then later, I invoked `bzr help remove' (presumably, I learned that I
> had inadvertently added W3M mode files to the master copy) but have
> not done any removes.

I think you should search earlier in your .bzr.log for a command that
inadvertently merged emacs-w3m with the trunk.  When do you see for
the first time files with any of the .OTHER, .BASE, and .THIS
suffixes?  That's where the problem began, I think.

Re: emacs-w3m?

[Robert J. Chassell]

I don't have `lisp/ChangeLog.OTHER' in either trunk or quickfixes (or
the moved files) or `ChangeLog.OTHER' in either trunk or quickfixes (or
the moved files).

I suspect I gave the command

    bzr add lisp/ChangeLog.OTHER --file-ids-from=sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/

to add that file to the lisp directory of my trunk repository and then
found it did not exist.  Then I did a merge from quickfixes that had
my trunk repository as a remembered parent location.

I update my trunk respository each morning at about 0945 UTC, build
Emacs with two commands in an older Emacs, and go from there.  Usually,
editing text and multiclient efforts are good.  Mostly, I am not
connected to the Internet.

    (progn
      (cd "/usr/local/src/emacs/trunk")
      (compile
       "time make -k -C lisp autoloads \
        EMACS=/usr/local/src/emacs/trunk/src/emacs && \
        cd lisp && \
        time make EMACS=/usr/local/src/emacs/trunk/src/emacs && \
        cd /usr/local/src/emacs/trunk && \
        time make info html"))

    (progn
      (cd "/usr/local/src/emacs/trunk/")
      (compile "time make -k"))

 I think you should search earlier in your .bzr.log for a command that
 inadvertently merged emacs-w3m with the trunk.  When do you see for
 the first time files with any of the .OTHER, .BASE, and .THIS
 suffixes?  That's where the problem began, I think.

No, the first appearance of emacs-w3m is when I mistakenly committed to
the master on Wed 2010-02-24 22:07:19 +0000.  I did an iseach and occur
using both emacs-w3m and OTHER and did not find anything earlier.

I may have a problem computing, although as far as I know I have
followed all the documentation.

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[Eli Zaretskii]

> Cc: ofv@wanadoo.es, emacs-devel@gnu.org
> From: bob@gnu.org (Robert J. Chassell)
> Date: Fri, 26 Feb 2010 11:59:34 -0500
> 
>  I think you should search earlier in your .bzr.log for a command that
>  inadvertently merged emacs-w3m with the trunk.  When do you see for
>  the first time files with any of the .OTHER, .BASE, and .THIS
>  suffixes?  That's where the problem began, I think.
> 
> No, the first appearance of emacs-w3m is when I mistakenly committed to
> the master on Wed 2010-02-24 22:07:19 +0000.  I did an iseach and occur
> using both emacs-w3m and OTHER and did not find anything earlier.

In this fragment of your log, which shows your commit which added
emacs-w3m to the public repository, where did the `share' directory
come from?

> Wed 2010-02-24 22:07:19 +0000
> 0.161  bzr arguments: [u'commit', u'-m', u'Merge: add word to sentence in trunk/doc/lispintro/emacs-lisp-intro.texi, in section Finding More Information']
> 0.219  looking for plugins in /home/bob/.bazaar/plugins
> 0.220  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
> 0.640  encoding stdout as sys.stdout encoding 'ISO-8859-1'
> 0.841  opening working tree '/usr/local/src/emacs/trunk'
> 1.240  bzr-svn: using Subversion 1.6.9 ()
> 1.334  ssh implementation is OpenSSH
> 4.029  preparing to commit
> [16788] 2010-02-24 22:07:26.190 INFO: Committing to: sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/
> 6.663  Selecting files for commit with filter None
> [16788] 2010-02-24 22:07:26.368 INFO: modified configure
> [16788] 2010-02-24 22:07:26.370 INFO: missing configure.BASE
> [16788] 2010-02-24 22:07:26.371 INFO: missing configure.OTHER
> [16788] 2010-02-24 22:07:26.373 INFO: missing configure.THIS
> [16788] 2010-02-24 22:07:26.440 INFO: added log-n0.out
> [16788] 2010-02-24 22:07:26.457 INFO: added share
> [16788] 2010-02-24 22:07:27.382 INFO: modified doc/lispintro/emacs-lisp-intro.texi
> [16788] 2010-02-24 22:07:40.696 INFO: added share/emacs
> [16788] 2010-02-24 22:07:40.697 INFO: added share/info
> [16788] 2010-02-24 22:07:40.700 INFO: added share/emacs/site-lisp
> [16788] 2010-02-24 22:07:40.702 INFO: added share/emacs/site-lisp/w3m
> [16788] 2010-02-24 22:07:40.730 INFO: added share/emacs/site-lisp/w3m/ChangeLog
> [16788] 2010-02-24 22:07:40.732 INFO: added share/emacs/site-lisp/w3m/ChangeLog.1

How did the directory `share' get created in the trunk working tree?

Re: emacs-w3m?

[Robert J. Chassell]

    In this fragment of your log, which shows your commit which added
    emacs-w3m to the public repository, where did the `share' directory
    come from?

    How did the directory `share' get created in the trunk working tree?

I have no idea.  That is part of the problem.

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[Eli Zaretskii]

> Cc: emacs-devel@gnu.org
> From: bob@gnu.org (Robert J. Chassell)
> Date: Fri, 26 Feb 2010 16:50:25 -0500
> 
>     In this fragment of your log, which shows your commit which added
>     emacs-w3m to the public repository, where did the `share' directory
>     come from?
> 
>     How did the directory `share' get created in the trunk working tree?
> 
> I have no idea.  That is part of the problem.

Does its creation date and time give you any clues?

Re: emacs-w3m?

[Robert J. Chassell]

    >     How did the directory `share' get created in the trunk working tree?
    > 
    > I have no idea.  That is part of the problem.

    Does its creation date and time give you any clues?

No.  I wish they did.  I know is that I used W3M mode to view
BzrForEmacsDevs and BzrQuickStartForEmacsDevs, but that's all.
W3M mode was in Emacs.  It is very strange.  `share' should not
be part of trunk at all, not the master or a branch.

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[David De La Harpe Golden]

Robert J. Chassell wrote:
>     >     How did the directory `share' get created in the trunk working tree?
>     > 
>     > I have no idea.  That is part of the problem.
> 
>     Does its creation date and time give you any clues?
> 
> No.  I wish they did.  I know is that I used W3M mode to view
> BzrForEmacsDevs and BzrQuickStartForEmacsDevs, but that's all.
> W3M mode was in Emacs.  It is very strange.  `share' should not
> be part of trunk at all, not the master or a branch.
> 


FWIW: did you ever happen to try the --with-emacs option to emacs-w3m's 
configure script?  In my testing just now, I found that if I passed
a path to an emacs binary still in the source tree rather than an 
installed emacs, e.g.

./configure --with-emacs=/usr/local/src/emacs/src/emacs

it'll detect and use the emacs source tree as the prefix.

, not /usr/local  - and install to 
/usr/local/src/emacs/share/emacs/site-lisp/w3m/

Obviously, if you were to explicitly do
./configure --prefix=/usr/local/src/emacs/
it'll end up there too, but the --with-emacs behaviour
is a little sneakier -  if you, say, thought you could use --with-emacs 
to use a freshly built but not yet installed emacs to build emacs-w3m, 
and it would still install to the default /usr/local/ prefix, well, it 
doesn't.

Re: emacs-w3m?

[Stephen J. Turnbull]

Eli Zaretskii writes:

 > There's also the bzr-diffstat plugin, which shows a bit more about the
 > uncommitted changes than "bzr status".

diffstats are nice for VCS geeks, but what Robert needed to know was
just the files.

I've updated BzrForEmacsDevs.  I ended up adding a bzr status before
each commit in each sample workflow; this may be too obtrusive, feel
free to edit.  I couldn't see any good way to ensure that readers would
always notice the "vcs means never having to say you're sorry, but
..." blurb at the top.

I'll take a look at the QuickStart document after dinner.

Re: emacs-w3m?

[Robert J. Chassell]

David De La Harpe Golden <david@harpegolden.net> writes:

    > FWIW: did you ever happen to try the --with-emacs option to emacs-w3m's 
    > configure script?  In my testing just now, I found that if I passed
    > a path to an emacs binary still in the source tree rather than an 
    > installed emacs, e.g.
    >
    > ./configure --with-emacs=/usr/local/src/emacs/src/emacs
    >
    > it'll detect and use the emacs source tree as the prefix.

No.  I did not even know you could do that.  I followed the instructions
a man on the project gave me some years ago.  I bet the option either
did not exist then or he was trying to simplify for me.  W3M mode has
worked fine since.

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[Óscar Fuentes]

"Stephen J. Turnbull" <turnbull@sk.tsukuba.ac.jp> writes:

> Eli Zaretskii writes:
>
>  > There's also the bzr-diffstat plugin, which shows a bit more about the
>  > uncommitted changes than "bzr status".
>
> diffstats are nice for VCS geeks, but what Robert needed to know was
> just the files.
>
> I've updated BzrForEmacsDevs.  I ended up adding a bzr status before
> each commit in each sample workflow; this may be too obtrusive, feel
> free to edit.  I couldn't see any good way to ensure that readers would
> always notice the "vcs means never having to say you're sorry, but
> ..." blurb at the top.
>
> I'll take a look at the QuickStart document after dinner.

This is about basic VC usage here. The QuickStart is not intended to
teach the basic rules of a VC system (nor the BzrForEmacsDevs document
intends that, I think) This was about teaching Emacs hackers with a long
CVS experience how to switch to Bazaar. I'm sure that doing a blind
commit was deemed as an unaceptable practice on the CVS days too, and
the checks are similar (`diff'). So making the documents more
verbose/tedious for covering this case is not necessary, IMHO.

But I see that you already edited the file. This looks confusing to me:

> Optionally, before doing ##bzr commit##, you can do ##bzr status## to
> view the changed and unknown files which will be committed."

it can be interpreted as if `bzr commit' will commit unknown files. And
then this:

> Typically unknown files are newly added. In
> order to track changes in them, use the ##bzr add## command and then
> commit them:
> * ##bzr add new-file ...##
> * ##bzr commit new-file ...##

may be read as recommending that the procedure for tracking a new file
is adding it and committing, instead of including it on the commit of
the rest of edited files.

And no, I don't want to waste my time editing wikis anymore, so feel
free to ignore the comments above.

Re: emacs-w3m?

[Eli Zaretskii]

> From: Óscar Fuentes <ofv@wanadoo.es>
> Date: Sat, 27 Feb 2010 12:10:49 +0100
> 
> I'm sure that doing a blind commit was deemed as an unaceptable
> practice on the CVS days too, and the checks are similar
> (`diff').

I think the problem is with the following ``feature'' of "bzr add":

  Adding a file whose parent directory is not versioned will implicitly
  add the parent, and so on up to the root. This means you should never
  need to explicitly add a directory, they’ll just get added when you
  add a file in the directory.

The second sentence explains the rationale behind this feature.  But
in this case, Bob mistakenly added a single file, and that ended up
adding the whole directory.  By contrast, "cvs add" is explicitly
non-recursive, AFAIR.

The question is: how do we tell users, and especially non-experienced
ones, to avoid this pitfall?  Obviously, discouraging the use of
"bzr add" is a non-starter.

Re: emacs-w3m?

[Eli Zaretskii]

> Cc: ofv@wanadoo.es, emacs-devel@gnu.org
> From: bob@gnu.org (Robert J. Chassell)
> Date: Fri, 26 Feb 2010 11:59:34 -0500
> 
> I suspect I gave the command
> 
>     bzr add lisp/ChangeLog.OTHER --file-ids-from=sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/
> 
> to add that file to the lisp directory of my trunk repository and then
> found it did not exist.

Can you remember what caused you to issue this "bzr add" command?  Was
it some message from Bazaar?  If so, what message?  (The portion of
your ~/.bzr.log immediately preceding that command may help you
refresh your memory.)

Re: emacs-w3m?

[Óscar Fuentes]

Eli Zaretskii <eliz@gnu.org> writes:

> I think the problem is with the following ``feature'' of "bzr add":
>
>   Adding a file whose parent directory is not versioned will implicitly
>   add the parent, and so on up to the root. This means you should never
>   need to explicitly add a directory, they’ll just get added when you
>   add a file in the directory.
>
> The second sentence explains the rationale behind this feature.  But
> in this case, Bob mistakenly added a single file, and that ended up
> adding the whole directory.

bzr add foo/bar

adds `foo/bar' (which implies adding `foo') but does not add other files
on the `foo' directory. For that, you need `bzr add foo' or simply `bzr
add', wich adds all unknown non-ignored files.

> By contrast, "cvs add" is explicitly non-recursive, AFAIR.

Yep, which is a PITA if you are using cvs from the command line.

> The question is: how do we tell users, and especially non-experienced
> ones, to avoid this pitfall?  Obviously, discouraging the use of
> "bzr add" is a non-starter.

IMO the lesson learned on this thread is that we must revise the changes
before committing them (big news!). Once you know that a file or
directory was added by mistake, a `bzr revert <name>' will fix the
problem right away.

Re: emacs-w3m?

[Stephen J. Turnbull]

Óscar Fuentes writes:

 > This is about basic VC usage here. The QuickStart is not intended to
 > teach the basic rules of a VC system (nor the BzrForEmacsDevs document
 > intends that, I think)

Unfortunately, this much seems to be needed.

 > This was about teaching Emacs hackers with a long CVS experience
 > how to switch to Bazaar.

As Eli points out, CVS reflexes will be wrong with Bazaar because
Bazaar tries very hard to DWIM.

 > I'm sure that doing a blind commit was deemed as an unaceptable
 > practice on the CVS days too, and the checks are similar
 > (`diff').

I'll bet you're wrong; likely C-x C-s C-x v v is burned into the tips
of a lot of fingers around here.  Remember, that's one reason why
QuickStart got written, so that people could have a vc.el-compatible
workflow.

 > This looks confusing to me:

Thanks for the review.  You're right, so I've fixed these.

Re: emacs-w3m?

[Stephen J. Turnbull]

Eli Zaretskii writes:

 > The second sentence explains the rationale behind this feature.  But
 > in this case, Bob mistakenly added a single file, and that ended up
 > adding the whole directory.

I don't think so.  I read that doc as saying it adds ancestors, but
not their contents, and a quick test shows it to be so:

$ mkdir test; cd test; bzr init
Created a standalone tree (format: 2a)                                          
$ mkdir subdir
$ for i in foo bar; do echo $i > subdir/$i; done
$ bzr add subdir/foo
adding subdir
adding subdir/foo
$ bzr status
added:
  subdir/
  subdir/foo
unknown:
  subdir/bar
$ 

I don't know what Bob did, but I think it was more inclusive
(presumably by Bazaar DWIM behavior) than adding a single file.

Re: emacs-w3m?

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <stephen@xemacs.org>
> Cc: Óscar Fuentes <ofv@wanadoo.es>,
>     emacs-devel@gnu.org
> Date: Sat, 27 Feb 2010 21:57:01 +0900
> 
> $ bzr add subdir/foo
> adding subdir
> adding subdir/foo

What if you "cd subdir; bzr add foo"?

> I don't know what Bob did, but I think it was more inclusive
> (presumably by Bazaar DWIM behavior) than adding a single file.

Maybe.  But, given that his .bzr.log only has a single "add" command
for that single file, what else could be at work here?  What about
symlinks (assuming that `share' directory was/is a symlink) -- could
that be the reason for an implicit "add"?

(At this point, it is probably worth asking these questions on the
bazaar list, though.)

Re: emacs-w3m?

[Stephen J. Turnbull]

Eli Zaretskii writes:

 > Maybe.  But, given that his .bzr.log only has a single "add" command
 > for that single file, what else could be at work here?

How could anyone guess?  Bob posted an incomplete log (that's clear
both from the fact that part he did post starts with that add command
and from his comments about using isearch and M-x occur on the whole
log).  Even so we can see that he was typing bzr commands more or less
at random in the face of repeated warnings from bzr that his workspace
was not in a consistent state -- but he didn't report any of that.

My advice is to forget it unless it happens again, and we can get a
better trace of what actually was done.

Re: emacs-w3m?

[Stephen J. Turnbull]

Eli Zaretskii writes:
 > > From: "Stephen J. Turnbull" <stephen@xemacs.org>

 > > $ bzr add subdir/foo
 > > adding subdir
 > > adding subdir/foo
 > 
 > What if you "cd subdir; bzr add foo"?

As you would expect, you get the same result.  But a "bzr add" with no
arguments adds both files and "subdir" itself.

$ mkdir test; cd test; bzr init                 
Created a standalone tree (format: 2a)
$ mkdir subdir; cd subdir; for i in foo bar; do echo $i > $i; done       
$ bzr add foo
adding subdir
adding subdir/foo
$ bzr status
added:
  subdir/
  subdir/foo
unknown:
  subdir/bar
$ cd ../../; rm -rf test
$ mkdir test; cd test; bzr init
Created a standalone tree (format: 2a)
$ mkdir subdir; cd subdir; for i in foo bar; do echo $i > $i; done
$ bzr add
adding subdir
adding subdir/bar
adding subdir/foo
$ bzr status
added:
  subdir/
  subdir/bar
  subdir/foo
$ 

Re: emacs-w3m?

[Robert J. Chassell]

    > I suspect I gave the command
    > 
    >     bzr add lisp/ChangeLog.OTHER --file-ids-from=sftp://bob@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/
    > 
    > to add that file to the lisp directory of my trunk repository and then
    > found it did not exist.


    Can you remember what caused you to issue this "bzr add" command?  

To obtain a clean lisp/ChangeLog but I saw the result

   NoSuchFile: No such file: u'/usr/local/src/emacs/trunk/lisp/ChangeLog.OTHER'

Before that, I did

   Sat 2010-02-20 12:13:57 +0000
   0.186  bzr arguments: [u'help', u'add']
   0.248  looking for plugins in /home/bob/.bazaar/plugins
   0.249  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
   0.700  encoding stdout as sys.stdout encoding 'ISO-8859-1'
   0.837  return code 0

I suspect you are right, that, 

    The second sentence explains the rationale behind this feature.  But
    in this case, Bob mistakenly added a single file, and that ended up
    adding the whole directory.  By contrast, "cvs add" is explicitly
    non-recursive, AFAIR.

Saturday was several days before my erroneous commit.  Although I spent
several hours on the commit and tried to do things right, I failed.  I
won't make the same mistake again.  Thank you.

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[Robert J. Chassell]

"Stephen J. Turnbull" <turnbull@sk.tsukuba.ac.jp> writes:
    
    But a "bzr add" ...

On Wednesday, 2010-02-24 at 22:07 UTC, I did a 

    bzr commit -m"Merge: add word to sentence in trunk/doc/lispintro/emacs-lisp-intro.texi, in section Finding More Information"

The `bzr add' was the Saturday before and I did not do any more add's
before or on Wednesday.  That or more likely Eli's suggestion that the
command is different from CVS may be the problem.

-- 
    Robert J. Chassell                          
    bob@gnu.org                                 bob@rattlesnake.com
    http://www.rattlesnake.com                  http://www.teak.cc

Re: emacs-w3m?

[Richard Stallman]

      Adding a file whose parent directory is not versioned will implicitly
      add the parent, and so on up to the root. This means you should never
      need to explicitly add a directory, they ll just get added when you
      add a file in the directory.

    The second sentence explains the rationale behind this feature.  But
    in this case, Bob mistakenly added a single file, and that ended up
    adding the whole directory.  By contrast, "cvs add" is explicitly
    non-recursive, AFAIR.

The feature is clearly a convenience in the case where you are not
making a mistake.  Should `bzr add' ask for confirmation before doing
this?

Re: emacs-w3m?

[Stephen J. Turnbull]

Richard Stallman writes:
 >       Adding a file whose parent directory is not versioned will implicitly
 >       add the parent, and so on up to the root. This means you should never
 >       need to explicitly add a directory, they ll just get added when you
 >       add a file in the directory.
 > 
 >     The second sentence explains the rationale behind this feature.  But
 >     in this case, Bob mistakenly added a single file, and that ended up
 >     adding the whole directory.  By contrast, "cvs add" is explicitly
 >     non-recursive, AFAIR.
 > 
 > The feature is clearly a convenience in the case where you are not
 > making a mistake.  Should `bzr add' ask for confirmation before doing
 > this?

No.

The feature described above doesn't invite mistakes.  Both a careful
reading of the documentation, and experimentation with bzr, indicate
that it adds (a) the files requested on the command line, and (b) the
parent directories, and nothing else.

The implicit "add everything" command, "bzr add", is somewhat
dangerous, but that feature is really only useful when importing a new
project, ie, in the idiom "bzr init; bzr add".  To add new files to an
existing project, it's almost always preferable to use an explicit
argument, because there is very often junk like test files or personal
notes that it would pick up.  Usually either a single file name, a
single glob, or "." (meaning "everything in this subdirectory", such
as when adding a large package like CEDET to Emacs) is sufficient.
Those are hardly inconvenient.

Re: emacs-w3m?

[Eli Zaretskii]

> From: Richard Stallman <rms@gnu.org>
> CC: ofv@wanadoo.es, emacs-devel@gnu.org
> Date: Sun, 28 Feb 2010 10:03:41 -0500
> 
>       Adding a file whose parent directory is not versioned will implicitly
>       add the parent, and so on up to the root. This means you should never
>       need to explicitly add a directory, they ll just get added when you
>       add a file in the directory.
> 
>     The second sentence explains the rationale behind this feature.  But
>     in this case, Bob mistakenly added a single file, and that ended up
>     adding the whole directory.  By contrast, "cvs add" is explicitly
>     non-recursive, AFAIR.
> 
> The feature is clearly a convenience in the case where you are not
> making a mistake.  Should `bzr add' ask for confirmation before doing
> this?

Maybe, at least as an option.  There's also the use-case of calling
bzr from Emacs, which we should take into consideration: is
interaction supported in that case?

Re: emacs-w3m?

[Stefan Monnier]

> The feature is clearly a convenience in the case where you are not
> making a mistake.  Should `bzr add' ask for confirmation before doing
> this?

There'd be very little justification for such a prompt:
- prompts suck for command line tools that can be used in scripts (or
  by Emacs packages ;-)
- "bzr add" prints the list of files it actually added, so if it adds
  some files you didn't expect, you have a fair chance of noticing it
  after the fact.
- the effect of an overzealous "bzr add" can be cancelled without harm
  any time until the next "commit".
- it's usually recommended to use "<backend> diff" before a "<backend> commit"
  so as to make sure you don't commit something by mistake, and that
  would give one last chance to catch a "bzr add" that added more
  than expected.


-- Stefan

Re: emacs-w3m?

[David Reitter]

[-- Attachment #1: Type: text/plain, Size: 1005 bytes --]

On Feb 27, 2010, at 12:13 PM, Robert J. Chassell wrote:
> 
>    bzr commit -m"Merge: add word to sentence in trunk/doc/lispintro/emacs-lisp-intro.texi, in section Finding More Information"

The BzrForEmacsDevs page suggests using the "commit -m" syntax in several places.  I don't like using this because it doesn't show which files are going to be committed.  Using "commit" with an editor for the message encourages people to provide the correct log message (one line as summary, then more detailed prose), and it allows them to see what is going to be included in the change.  Many times (with git) stopped at this point, canceled the commit and went back to add another part of the change.  I think it would have prevented Bob's 30MB commit, regardless of what led to the "add".

This would be especially important in conjunction with the mirrored branches, where a commit pushes automatically (if I understand correctly).

I would suggest to only show people how to use commit with an editor.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 203 bytes --]

Re: emacs-w3m?

[Miles Bader]

Stefan Monnier <monnier@iro.umontreal.ca> writes:
> There'd be very little justification for such a prompt:
> - prompts suck for command line tools that can be used in scripts (or
>   by Emacs packages ;-)
> - "bzr add" prints the list of files it actually added, so if it adds
>   some files you didn't expect, you have a fair chance of noticing it
>   after the fact.
> - the effect of an overzealous "bzr add" can be cancelled without harm
>   any time until the next "commit".
> - it's usually recommended to use "<backend> diff" before a "<backend> commit"
>   so as to make sure you don't commit something by mistake, and that
>   would give one last chance to catch a "bzr add" that added more
>   than expected.

All that said, it seems far better to just do what git does, and require
one to type "... add ." instead.  Mistakes are still possible (and thus
your points remain), but much more difficult in practice.

-Miles

-- 
97% of everything is grunge

Re: emacs-w3m?

[Stefan Monnier]

>> There'd be very little justification for such a prompt:
>> - prompts suck for command line tools that can be used in scripts (or
>> by Emacs packages ;-)
>> - "bzr add" prints the list of files it actually added, so if it adds
>> some files you didn't expect, you have a fair chance of noticing it
>> after the fact.
>> - the effect of an overzealous "bzr add" can be cancelled without harm
>> any time until the next "commit".
>> - it's usually recommended to use "<backend> diff" before a "<backend> commit"
>> so as to make sure you don't commit something by mistake, and that
>> would give one last chance to catch a "bzr add" that added more
>> than expected.

> All that said, it seems far better to just do what git does, and require
> one to type "... add ." instead.  Mistakes are still possible (and thus
> your points remain), but much more difficult in practice.

Probably doesn't make any difference: he would have typed "bzr add ."
rather than "bzr add" and the result would have been the same.


        Stefan

Re: emacs-w3m?

[Miles Bader]

Stefan Monnier <monnier@iro.umontreal.ca> writes:
> Probably doesn't make any difference: he would have typed "bzr add ."
> rather than "bzr add" and the result would have been the same.

No, I think that's wrong.

I don't really know why he typed "bzr add" (i.e., whether by sheer
accident, or in confusion about what it did), but in general it seems
_much_ more likely for somebody to accidentally type a command with no
arguments, than with an explicit "this directory".

Thus given the somewhat rare nature of needing to do such a thing, this
default for "bzr seems" an exceedingly poor choice.  Hopefully the bzr
devs will change this.

-Miles

-- 
Selfish, adj. Devoid of consideration for the selfishness of others.

Re: emacs-w3m?

[Eli Zaretskii]

> From: Miles Bader <miles@gnu.org>
> Cc: ofv@wanadoo.es, Eli Zaretskii <eliz@gnu.org>, rms@gnu.org,
>         emacs-devel@gnu.org
> Date: Mon, 01 Mar 2010 16:06:44 +0900
> 
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
> > Probably doesn't make any difference: he would have typed "bzr add ."
> > rather than "bzr add" and the result would have been the same.
> 
> No, I think that's wrong.
> 
> I don't really know why he typed "bzr add" (i.e., whether by sheer
> accident, or in confusion about what it did)

For the record: Bob says that there's only one instance of the "add"
command in his .bzr.log, and it's for a single specific (though
non-existent) file.  How the whole directory got added is still
largely a mystery.

Re: emacs-w3m?

[Richard Stallman]

    For the record: Bob says that there's only one instance of the "add"
    command in his .bzr.log, and it's for a single specific (though
    non-existent) file.  How the whole directory got added is still
    largely a mystery.

Please report this as a bug to the bzr developers.
They are the ones who should try to figure out what happened.

Re: emacs-w3m?

[Eli Zaretskii]

> From: Richard Stallman <rms@gnu.org>
> CC: miles@gnu.org, monnier@iro.umontreal.ca, ofv@wanadoo.es,
> 	emacs-devel@gnu.org
> Date: Tue, 02 Mar 2010 12:39:57 -0500
> 
>     For the record: Bob says that there's only one instance of the "add"
>     command in his .bzr.log, and it's for a single specific (though
>     non-existent) file.  How the whole directory got added is still
>     largely a mystery.
> 
> Please report this as a bug to the bzr developers.

Bob should do that, not me.  The developers will most probably ask all
kinds of questions that I cannot answer anyway.