On Tue, Apr 15, 2008 at 1:39 AM, Terry Brown <[EMAIL PROTECTED]> wrote:
> 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) You should never push no another branch - you should always do merge instead. Push is essentially a copy operation that makes the target branch the same as the source branch. I'm surprised that bzr let you do that. > 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 Yeah, this is the correct proceduce. -- Ville M. Vainio - vivainio.googlepages.com blog=360.yahoo.com/villevainio - g[mail | talk]='vivainio' --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
