> cd ..
> bzr pull lp:leo-editor clean_trunk
> cd clean_trunk
> bzr merge ../mattsbranch
> bzr commit -m'merged my safe xxzzyy changes'
> # verify with bzr qlog that just your safe changes are committed
> bzr push --remember :parent
>

Thank you Terry. This worked and wasn't even painful. :)  A big improvement
over the last go 'round is having moved to a shared parent repo; much
faster!

I'll save resurrecting the experimental stuff for tomorrow.

-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.


Reply via email to