On Wed, 1 Feb 2012 19:29:30 -0500 Brian Theado <[email protected]> wrote:
> On Wed, Feb 1, 2012 at 9:44 AM, Edward K. Ream <[email protected]> wrote: > > There was a very strange bzr error when trying to merge my recent work > > with Brian's with qtGui.p. Something about not being able to change > > history. The diffs between 4961 and 4960 made no sense at all. I'm not > > blaming Brian: it's likely a bzr problem. > > If there's anything I should do different, let me know. Maybe give > you a heads up before pushing my changes? One scenario which might explain what happened would be Edward merging your changes *from* the trunk *into his branch*, then trying to push the result. By default that would work, but it would make your changes a sub-commit of Edward's commit, which makes the trunk history hard to follow. So the repo. has a flag set which causes it to reject such a push, I suspect that was the message Edward saw. All you need to do is pull a clean version of the trunk, which only take a few seconds if your local branches are in a shared repository directory, then merge (automatically) your branch in to that, then push from there. As an aside, it's ok to merge the trunk into your branch to keep up with the trunk while you're developing in your branch, you can still merge your branch into a clean pull of the trunk even if the branch already contains the new revisions in the trunk. Leo's development cycles are short enough and its contributer few enough that that's probably not necessary, but it doesn't interfere. If that scenario's what happened, there's really nothing more you need to do, it's just a matter of the developer wanting to push to a trunk that's changed grabbing a clean copy of the trunk and merging into that. Cheers -Terry -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/leo-editor?hl=en.
