Bazaar

Central repository: update without creating pending merge from local commits

Asked by Craig Hewetson

When you have a checkout with a local commit in it and you run an update, it moves your local commit out into a ending merge. This is all well and good, but is there any way that you can do an update without this happening?

The workflow we are trying to get is where you are working on code you do not want to commit into the central branch, but you do want to integrate the whole time, therefore it would be:

1. bzr commit -local

2. bzr update -keep local

3. bzr commit -local

4. bzr update -keep local

5. ...

6. bzr update

7. bzr commit

I realise you can do this by unbinding and merging and then binding again before you want to commit it to the central branch, but I was just wondering if you can do it while bound.

Question information

Language:
English Edit question
Status:
Answered
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Last query:
Last reply:
Revision history for this message
Launchpad Janitor (janitor) said : 		#1

This question was expired because it remained in the 'Open' state without activity for the last 15 days.

Revision history for this message
Craig Hewetson (craighewetson-deactivatedaccount) said : 		#2

nudge nudge

Revision history for this message
Launchpad Janitor (janitor) said : 		#3

This question was expired because it remained in the 'Open' state without activity for the last 15 days.

Revision history for this message
Martin Pool (mbp) said : 		#4

In short, no you cannot do this at the moment. Probably the best thing is to not use a bound branch but rather have your own, merge from the main branch, and then occasionally push back when you feel you've got to a good state.

If you can provide a user story about what you're doing here we can consider it for the 3.0 ui work.

Can you help with this problem?

Provide an answer of your own, or ask Craig Hewetson for more information if necessary.

To post a message you must log in.