Krzysztof Kosiński wrote
Is there a way to undo the update and get back the situation before the failed commit so you can turn it into a local (successful) commit with your changes only?
If the manual is correct, I think you could use this:
- bzr update -r xxx, where xxx is the revision where your changes
applied cleanly 2. bzr unbind - this will convert from a checkout to a regular branch 3. bzr commit
Unfortunately this does not work if the update has been issued on changes that were not yet committed and this happens because the commit of a checkout is impossible until the update is done. You should do a commit --local (shorter than bzr unbind; bzr commit) before the update, hence: how can you know how "heavy" the update will be before doing it? When you've done it, it's too late... And if you always do a local commit before every update (just in case of), your changes will be recorded as a separate branch which has diverged and then has been merged, even for just a couple of lines of code.
Luca
-- View this message in context: http://inkscape.13.x6.nabble.com/Help-with-bzr-tp4969689p4969713.html Sent from the Inkscape - Dev mailing list archive at Nabble.com.