Code review comment for lp:~colin-king/ecryptfs/ecryptfs-spelling-fixes

On 22/11/13 18:03, Tyler Hicks wrote:
> On 2013-11-22 17:48:15, Colin King wrote:
>> On 22/11/13 17:32, Tyler Hicks wrote:
>>> Review: Approve
>>>
>>> Looks good. Please push it to trunk. Thanks!
>>>
>>
>> My bzr foo is lame, in fact I've never done that before (I mainly use
>> git). How do I do that w/o messing up the world?
>
> If your bzr branch is simply trunk + your patches, then
> `bzr push lp:ecryptfs` will do.

Thanks, done.
>
> If your bzr branch is an older version of trunk + your patches, I really
> don't know what the best way is (this is where I miss my git workflow).
> You can checkout trunk in a new branch, `bzr branch lp:ecryptfs`, and
> then cd into the new branch and merge in your feature branch with
> `bzr merge ../path/to/feature/branch`. I don't really like doing that
> because it ends up hiding all of the commits behind a single merge
> commit. If my feature branch is behind trunk, I usually manually
> cherry-pick the commits in my feature branch to a fresh checkout of
> trunk.
>
> Hopefully paragraph 1 describes your situation. Don't mess with it for
> too long, though. If you're having any trouble at all, kick it back over
> to me and I'll pull in your changes.
>