[cairo] [PATCH]A cairo-ps-surface.c issue for modern finicky versions of ghostscript

Carl Worth cworth at cworth.org
Tue Dec 4 23:50:00 PST 2007


On Sun, 02 Dec 2007 14:25:28 +1030, Adrian Johnson wrote:
> My version of git (1.5.2.4) does not appear to be recent enough. I get
>
> > git checkout -b 1.4 origin/1.4
> git checkout: updating paths is incompatible with switching branches/forcing
> Did you intend to checkout 'origin/1.4' which can not be resolved as
> commit?

It looks like 1.5.2.4 is plenty new enough. I just verified as follow:

	$ git version
	git version 1.5.2.4
	$ git clone git://anongit.freedesktop.org/git/cairo
	[snip progress indicators]
	$ cd cairo
	$ git checkout -b 1.4 origin/1.4
	Switched to a new branch "1.4"

> Is there an alternative sequence of commands I can use?

I'm guessing the problem is actually that you did the original clone
with an older version of git so it didn't setup the new-style "origin"
remote for you. You could probably get close with:

	$ git remote add origin git.freedesktop.org:/git/cairo
	$ git fetch origin

But if that doesn't work, I'd suggest just doing a new clone.

Good luck! And thanks in advance for all the great improvements that
you will land on the 1.4 branch.

-Carl
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.cairographics.org/archives/cairo/attachments/20071204/eea1b274/attachment.pgp 


More information about the cairo mailing list