MobileRead Forums - View Single Post - Workflow for making and submitting changes

kacir · 09-17-2011, 06:58 AM

Hi.

I have been trying to merge changes from the main tree (maintained by Kovid) to my private copy of the source, which has a few changes that I have made.

I was told that all that I have to do is:

Get sources from net to my machine
bzr branch lp:calibre

Make my desired [tiny] changes (that are unlikely to be accepted to the mainline)

update my private tree from the net, keeping my changes, by
bzr merge

When I issue bzr merge command, I am told that:
bzr: ERROR: Working tree "/home/kacir/MyCalibre/calibre/" has uncommitted changes (See bzr status).

So what happens when I commit changes?
Are my changes pushed to the net (which is, obviously, NOT what I want)?
Are my private changes in my private copy of sources marked as "commited" (whatever that means) and bzr stops complaining?

I thought that I understand basic operation of bzr, and that commit pushes my changes to the net, but now I suspect, it is a bit more complicated.

By the way, bzr complained when I was trying to pull the initial state of source until I have set my name by
bzr whoami kacir from Mobileread <kacir@thisisnotmyemail.com>
command.

09-17-2011, 06:58 AM	#8
kacir Wizard Posts: 3,450 Karma: 10484861 Join Date: May 2006 Device: PocketBook 360, before it was Sony Reader, cassiopeia A-20	What happens when I issue bzr commit command? Hi. I have been trying to merge changes from the main tree (maintained by Kovid) to my private copy of the source, which has a few changes that I have made. I was told that all that I have to do is: Get sources from net to my machine bzr branch lp:calibre Make my desired [tiny] changes (that are unlikely to be accepted to the mainline) update my private tree from the net, keeping my changes, by bzr merge When I issue bzr merge command, I am told that: bzr: ERROR: Working tree "/home/kacir/MyCalibre/calibre/" has uncommitted changes (See bzr status). So what happens when I commit changes? Are my changes pushed to the net (which is, obviously, NOT what I want)? Are my private changes in my private copy of sources marked as "commited" (whatever that means) and bzr stops complaining? I thought that I understand basic operation of bzr, and that commit pushes my changes to the net, but now I suspect, it is a bit more complicated. By the way, bzr complained when I was trying to pull the initial state of source until I have set my name by bzr whoami kacir from Mobileread <kacir@thisisnotmyemail.com> command.