Code review comment for lp:~zorba-coders/zorba/bug1058231
Revision history for this message
| Till Westmann (tillw) wrote | # |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
> 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.