I'm in a bzr tangle again, sorry folks! I have a small fix to add to the trunk, just 3 lines, and another larger more tentative experiment. I've have both changes in my local working copy of "trunk". I locally committed just the safe change, and left the other one out. I then went to push the safe change but was told I couldn't because the branches had diverged (someone else pushed something in the meantime).
I then merged the upstream changes while ignoring uncommitted changes. I expected it would bring in EKR's new revisions and merge them with my local safe committed changes, while leaving my still experimental things out of it, but that's not what happened. Everything is now all together committed locally - safe change, experimental one, upstream merge - with a bland log message "merge EKR's updates" that doesn't reveal the true nature of the change. I didn't create a branch for my experiment cause, well, the last time I did that things got all messed up in a different way (couldn't keep it sync with trunk without munging history; fixed thanks to Terry!). Well, this isn't any better. Lesson learned. What's the best thing to do now? create a new local check-out from trunk in a new folder, and then manually diff and merge the safe stuff from the tangled working copy? -matt -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/groups/opt_out.
