[Printing-architecture] Options in /etc/cups/printers.conf

Michael Sweet msweet at apple.com
Tue Jul 16 14:48:41 UTC 2013


On Jul 16, 2013, at 10:33 AM, Tim Waugh <twaugh at redhat.com> wrote:
> On Thu, 2013-07-11 at 09:11 -0400, Michael Sweet wrote:
>> Unfortunately, I was unable to coerce GIT-SVN into pulling from a
>> single repository. The CUPS SVN repository has been split since 2002
>> (easysw.com and apple.com), and so what I ended up doing is pulling
>> all of the snapshots and releases from easysw.com and the commits from
>> apple.com since late April/early May.
> I haven't tried that. I would have probably done two git-svn clones, one
> for each SVN repository, then tried to merge the newer into the older...
> but the merge point would have to be *exactly* the same and I guess
> that's where you had problems with it.

Actually, I was able to synchronize the SVN revisions between the two repositories (cups.org had a lot more commits than the internal Apple repo), but the issue is that the directory structure of the internal Apple repo is different than the cups.org repo.

To make matters worse, it doesn't look like GIT-SVN is properly mirroring things with the current GIT repository and I think I need to redo the whole thing again to make GIT happy...

I am going to try doing some SVN hackery to backup and restore the cups.org repository to match the Apple SVN repo structure, in case that allows me to provide a fuller history of things...  And then see if I can provide a stable GIT-SVN mirror...

(If that doesn't work then I'll just have to pull the GIT mirror for now; I can't provide a SVN mirror of the internal SVN repository...)

Michael Sweet, Senior Printing System Engineer, PWG Chair

More information about the Printing-architecture mailing list