How can I commit pending merges without commiting other changes.

Asked by amicitas

I use baazar with a centralized svn repository I typically commit changes by just using "bzr commit".

I recently was offline for a few days and and used:
  bzr commit --local

Now I would like to commit my local changes into the central svn repository. I would like to do this however without committing any other changes in my local directories.

"bzr commit" Looks like it will commit everything to the centralized repository, including any uncommitted changes in my local directory structure.

Is there a way I can commit only the pending merge tips?

Question information

Language:
English (United States) Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
Martin Pool
Solved:
Last query:
Last reply:
Revision history for this message
Best Martin Pool (mbp) said :
#1

Hi, amiciitas,

Probably the easiest way is to 'bzr shelve your uncommited changes,
then commit to the main branch, then commit your local changes, then
unshelve.

Revision history for this message
amicitas (mir-amicitas) said :
#2

This did the trick for me. Thanks!

Revision history for this message
amicitas (mir-amicitas) said :
#3

Thanks Martin Pool, that solved my question.