zorba-coders team mailing list archive

[Till Westmann <till.westmann@xxxxxxxxxx>]

> The removed/added problem is because Rodolfo initially deleted them, but then
> put them back based on my earlier comment.  Unfortunately I don't know of a
> way to fix this.

The way I usually solve this (if the history of the branch is not terribly relevant) is to create a patch from the branch, apply the patch to the trunk, and push it to a new branch. This loses the history in the branch, but gets better diff in the history of the trunk.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1058231/+merge/129531
Your team Zorba Coders is subscribed to branch lp:zorba.