[MERGE] Fix warning on working trees during push

[John A Meinel]

James Blackwell wrote:
> As people are aware, bzr currently complains about pushing working trees.
> This is consistantly interpreted as attempting to push has broken
> completely.
> 
> bzr: WARNING: Unable to update the working tree of:
> sftp://sivan@mercury.linuxguru.net/%2Fhome/sivan/public_html/home-user-backup/
> 
> This changes the warning to: 
> 
> bzr: WARNING: Working trees are no longer updated. 
> 
> What I didn't do, at least not yet, is plop a file in the working tree of
> pushed branches along the lines of:
> 
> pushed_branch$ ls
> .bzr/
> Bzr.Branch.Format-6
> 
> 
> Inside of BzrBranch.Format-6, I would put text along the following: 
> 
>  Bazaar-NG now pushes only the RCS data for branches. The files that you
>  are used to seing and editing (aka "The Working Tree") is no longer
>  pushed. Your branch will continue to work normally with comands such as
>  bzr pull and bzr merge.
> 
>  Please see http://bzrtooolshomepage if you need to push your working tree
>  as well.
> 
> 

First, I would change the 'warning(Unable to update)' line to say:
'note(Unable to update)'
This fixes the problem that users see 'WARNING' when really it is just
informing them.

I'm ambivalent about putting a file into the working tree. If there are
no files there, it is nice to see something (since .bzr is normally
hidden). But if there are files there, it is a little bit ugly to put
another file in the midst of them.

The WARNING should be changed for 0.7. I think we can change the message
so that people understand what is going on. What about instead of
warning('Unable to update the working tree of: %s' % (br_to.base,))

We use:

note('* Unable to update the working tree of: %s\n* Only the branch
information inside .bzr/ will be updated', br_to.base)

With that message, it makes it reasonably clear that we are updating the
remote branch, and that people should look for .bzr.

If we wanted to be a little bit more complete we could do:

note('* Unable to update the working tree. Only the branch information
inside %s/.bzr/ will be updated', br_to.base)

With this message, people can browse exactly to where the branch
information exists, so they can see that there are files created there.
And we make it clear that things are working, just not completely.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060114/0d950f5a/attachment.pgp