On Mon, 14 Apr 2008 15:16:19 -0700 (PDT) "Edward K. Ream" <[EMAIL PROTECTED]> wrote:
> On Apr 14, 2:41 pm, Terry Brown <[EMAIL PROTECTED]> wrote: > > Now I think about it I fear pushing from my branch to > > the trunk was monumentally stupid, I was confusing the > > effects of merge with pull. > > Usually, if I push and there have been other changes in the trunk, I > get a message that I should merge first. If you had done that, the > worst that could have happened, it seems to me, is that you would have > gotten conflicts. > > Can you tell us in more detail what you did? It would help me make > the same mistake ;-) > > The only thing I can think of that would have caused the chaos that > ensued was a push --overwrite. Did you do that? Here's my best guess at what I did, would be a little more certain if my 'cd' commands were included in my shell history, not that that's ever been an issue before. 1. committed some trivial changes in local:leo.tb 2. merged launchpad:trunk into local:leo.tb 3. resolved conflict in leoProjects.txt by accepting the version from launchpad:trunk 4. committed in local:leo.tb 5. pushed local:leo.tb to launchpad:trunk (without --overwrite) 6. pushed local:leo.tb to launchpad:leo.tb (without --overwrite) I think 5. was wrong, although it doesn't look that obviously wrong reading it like that. What I've done before and will do in future A commit whatever in local:leo.tb B pull launchpad:trunk into local:trunk C merge local:leo.tb into local:trunk D commit in local:trunk E push local:trunk to launchpad:trunk what I wasn't liking about that process is that the useful log message is the one from the commit on line A, unless you repeat that message on line D the trunk ends up with a "merged with trunk" log message. But obviously I wasn't on track for a work around. 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 -~----------~----~----~----~------~----~------~--~---
