submitting changes to kubuntu-docs>about-kubuntu

[Nitesh Mistry]

On Sun, Jul 25, 2010 at 12:18:58AM -0400, Vikram Dhillon wrote:
> Seems like I spoke too soon :) Nitesh your patch is fine, its just that
> the diff doesn't apply to the branch (its giving some errors). Please have a look here [1]   
> 
> [1] http://blogs.gnome.org/jamesh/2007/07/31/bazaar-bundles/
 

Thanks for the link.
May be it is my naivety while using bzr or some other problem, but I
have never been able to properly branch out from lp:kubuntu-docs ever
since I started working on it during lucid release cycle. Drawing the
example from the link, I do the following:

bzr branch lp:kubuntu-docs k-docs-mav
cd k-docs-mav

then I check using:

bzr status

and it gives a long list of files and folders (almost the entire tree) under
'removed' and 'unknown' headings. Also 'bzr diff' gives me the entire
content of the branch as the diff. If I made any changes to this branch,
those changes are shown in the diff along with all the other files that
I never touched.

I asked about this on the #bzr channel a while ago and someone suggested
that I do 'bzr add' and 'bzr commit' just after branching. So this is
what I do now:

bzr branch lp:kubuntu-docs k-docs-mav
cd k-docs-mav
bzr add # this gives a long list of files being added
bzr commit -m 'bzr is funny' # this gives a new revno (lp-revno + 1)
# make the changes to the files
bzr diff > diff.txt # this diff shows only my changes
bzr commit -m "my changes"

send this diff.txt file to the mailing list.

I tried pushing this branch to the lp under my account but when I sent a
merge proposal, it again showed up the entire content in the diff rather
than only my changes.

I am unable to pin-point the mistake/problem occuring here. I went
through the documentation at bzr site but couldn't find anything.

Hence I opted to only send this diff file to the mailing list, hoping
that someone would merge it manually.

Sorry for the inconvenience. Let me know if there is a better way of
contributing.


-- 
Regards,
Nitesh Mistry
www.mistrynitesh.com


-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GB/J/IT/O>TW d+(-) s+:+>: a- C+ UL>+++ P L++>+++ !E W++ N* o? K? w--- O? M-- V? PS+() PE(++)(-) Y+ PGP+ t 5? X R tv+ b+ DI D G e+++>++++ h-- !r y?
------END GEEK CODE BLOCK------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/ubuntu-doc/attachments/20100725/35640a50/attachment.pgp>