[Pkg-cups-devel] r588 - cupsys/branches/cups-1.2-ubuntu

[Martin Pitt]

Hi,

Martin Pitt [2007-09-11 21:09 +0000]:
> Author: mpitt
> Date: Tue Sep 11 21:09:32 2007
> New Revision: 588
> 
> Log:
> dummy-merge of everything in trunk up to 1.3.0-3, so that future merges will work properly

Just in case someone wonders about this: I imported both svn branches
(trunk and cups-1.2-ubuntu) into bzr branches, so that I can now use
my more familiar and convenient bzr commands, but mainly to finally
get back a sane merging between branches.

(Why oh why is subversion's design of branches so utterly broken?
*whine*)

Pitti

-- 
Martin Pitt        http://www.piware.de
Ubuntu Developer   http://www.ubuntu.com
Debian Developer   http://www.debian.org