FreeBSD: Updating ports with Git

Git About a month ago I installed ModularXorg, which required the use of the Experimental Git Repository. Git is a repository system similar to svn and cvs. It was initially developed by Linus Torvalds, but is now maintained by Junico C Hamano. Git is mainly used for large linux projects and is now being used for ModularXorg on FreeBSD. Using ModularXorg required following the procedures outline here., but now it has since been a month since I last updated my ports and doing so caused some problems, which were later fixed.

thinkpad# cd /usr/ports
thinkpad# git pull

remote: Generating pack…
remote: Done counting 431 objects.
remote: Result has 192 objects.
remote: Deltifying 192 objects.
remote: 100% (192/192) done
Unpacking 192 objects
remote: Total 192, written 192 (delta 176), reused 0 (delta 0)
100% (192/192) done
* refs/heads/xorg: not updating to non-fast forward branch ‘xorg’ of git://git.geekfire.com/git/ports
old…new: a5a2a51…2a6497c
Trying really trivial in-index merge…
MOVED: needs merge
finance/opentaxsolver/Makefile: needs merge
graphics/gauche-gl/Makefile: needs merge
graphics/libqglviewer/Makefile: needs merge
graphics/xmorph/Makefile: needs merge
x11/Makefile: needs merge
fatal: you need to resolve your current index first
Nope.
Merging HEAD with 351eb8691f8616f5af20f3c2147dab1f295902c7
Merging:
a5a2a51 Merge branch ‘master’ of git://git.geekfire.com/git/ports into xorg
351eb86 Automatic update.
found 1 common ancestor(s):
9c5edc1 Automatic update.
fatal: Entry ‘MOVED’ would be overwritten by merge. Cannot merge.
No merge strategy handled the merge.

I hate how Git will not proceed unless I merge the conflicts. This action is not required when using portsnap by the way. I can imagine this being a pain in the future. Luckily my buddy Dave suggested I perform the following procedures.

1) git reset –hard
2) git pull origin xorg

Always using “origin xorg” is advised by Dave, so not to pull from the master branch.

thinkpad# git reset –hard
14.683u 2.127s 1:00.18 27.9% 480+13544k 25573+140io 3032pf+0w

thinkpad# git pull origin xorg
remote: Generating pack…
remote: Done counting 431 objects.
remote: Result has 192 objects.
remote: Deltifying 192 objects.
remote: 100% (192/192) done
Unpacking 192 objects
remote: Total 192, written 192 (delta 176), reused 0 (delta 0)
100% (192/192) done
Merging HEAD with 2a6497c350b1b2dc30301a6df5b4a465b1eafce9
Merging:
a5a2a51 Merge branch ‘master’ of git://git.geekfire.com/git/ports into xorg
2a6497c libXau: use ln -sf rather than ln -s in post-install
found 2 common ancestor(s):
9c5edc1 Automatic update.
e52b79a setxkbmap: fix xkb path
Merging:
9c5edc1 Automatic update.
e52b79a setxkbmap: fix xkb path
found 1 common ancestor(s):
948ba34 Automatic update.
e52b79a setxkbmap: fix xkb path
found 1 common ancestor(s):
948ba34 Automatic update.
Removing devel/imake-6/Makefile
Removing devel/imake-6/distinfo
Removing devel/imake-6/files/patch-Imakefile
Removing devel/imake-6/files/patch-mkhtmlindex.pl
Removing devel/imake-6/scripts/configure
Removing graphics/dri/files/patch-freebsd-dri
Removing graphics/libGLU/files/patch-GLU-Imakefile
Removing graphics/libGLU/scripts/configure
Removing x11-fonts/fontconfig/files/pkg-install.in
Removing x11-fonts/xorg-fonts-100dpi/distinfo
Removing x11-fonts/xorg-fonts-100dpi/pkg-plist
Removing x11-fonts/xorg-fonts-100dpi/scripts/configure
Removing x11-fonts/xorg-fonts-75dpi/distinfo
…snip…
create mode 100644 x11-toolkits/jdic/pkg-descr
delete mode 100644 x11-toolkits/swt-devel/files/patch-xpcom_profile.h
create mode 100644 x11-toolkits/wxd/files/patch-wx-pointers
create mode 100644 x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
create mode 100644 x11-toolkits/wxgtk28/files/patch-src-common-intl.cpp
delete mode 100644 x11-wm/wmi/Makefile
delete mode 100644 x11-wm/wmi/distinfo
delete mode 100644 x11-wm/wmi/pkg-descr
create mode 100644 x11/kdebase3/files/patch-kwin-client.cpp
create mode 100644 x11/kxgenerator/Makefile
create mode 100644 x11/kxgenerator/distinfo
create mode 100644 x11/kxgenerator/pkg-descr
create mode 100644 x11/kxgenerator/pkg-plist
create mode 100644 x11/wbar/Makefile
create mode 100644 x11/wbar/distinfo
create mode 100644 x11/wbar/files/patch-Makefile
create mode 100644 x11/wbar/files/pkg-message.in
create mode 100644 x11/wbar/pkg-descr
create mode 100644 x11/wbar/pkg-plist
113.279u 12.044s 6:46.30 30.8% 218+17069k 1759+49276io 8689pf+2w

A little under seven minutes.

Advertisements
This entry was posted in *Nix. Bookmark the permalink.

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s