some git usage related queries
Hi: Here are some git usage related newbie queries. 1. i read a notification about a new commit eg. pkgsrc commit http://gitweb.dragonflybsd.org/pkgsrc.git/commit/4ceab3c0055ed6bdacff399294ff8ef253b99468 Since i maintain a local git repo for pkgsrc, i'd like to know the diff between what i got and what's in the latest commit. What command do i run locally to see the diff ? 2. i've pulled in latest commits using 'git pull'. While working with local repository, i want to know the diff between the last commit and the latest commit for a given file eg. nrelease/Makefile. what i tried doing was: # cd /usr/src # cd nrelease # git diff HEAD^ HEAD ./Makefile # This doesn't work. What is the correct approach here ? 3. after pulling in the changes related to Sascha's commit eg. when i tried this command: # git describe 5623ae32853fcfb747f493ea6af0059a56fb9b56 v2.5.1-200-g5623ae3 This doesn't show up the details of the commit. What would be the appropriate command to use ? 4. i apply some patches to a given file eg. Stathis' patch for mq*() syscall for MPSAFE # cd /usr/src # fetch http://leaf.dragonflybsd.org/~beket/mq-mpsafe.diff # git apply mq-mpsafe.diff Ideally i should have created a branch and then apply the patch. However, i applied the patch to the master. Some new files are created and some .bak files created. When i 'git pull' next, there are issues. What is a good practice to adopt here ? Is there also something as 'unapply' a patch in git ? i've readup Pragmatic version control with Git and GitUsage documentation in the wiki. So, while i can get around with basic Git commands, i'm still facing issues. i'd be grateful, if some of experienced folks on the project can share their nuggets of wisdom on this. Thanks for any help. thanks Saifi.
Re: Makefile upgrade: target for x86_64
On Sat, 7 Nov 2009, Simon 'corecode' Schubert wrote: YONETANI Tomokazu wrote: If you're performing the `approved method of upgrading your system', you're still running old kernel, which should return amd64. I've just upgraded my amd64 machine as described at the end of build(7) with a little arrangement: env - PATH=/sbin:/bin:/usr/sbin:/usr/bin __MAKE_CONF=/dev/null sh -c ' make buildworld make buildkernel KERNCONF=FOO make installkernel KERNCONF=FOO make installworld MACHINE_ARCH=x86_64 make upgrade ' (the first line is to get rid of extra env variables or /etc/make.conf) then rebooted, and now make command reports these variables correctly: $ cd $ env - PATH=$PATH make -V MACHINE_ARCH -V MACHINE -V MACHINE_PLATFORM x86_64 x86_64 pc64 correct. just reboot and then perform the make upgrade. Yonetani and Simon, thank you for the details. The box is now running DragonFly v2.5.1.201.gd6e55-DEVELOPMENT # make -V MACHINE_ARCH -V MACHINE -V MACHINE_PLATFORM x86_64 x86_64 pc64 # thanks Saifi.
Re: tcsh-6 compilation error with gcc44 (buildworld)
On Sat, 7 Nov 2009, Peter Avalos wrote: On Sat, Nov 07, 2009 at 09:49:50PM +0530, Saifi Khan wrote: Hi: On a AMD64X2 system running DragonFly v2.5.1.187.gc1543-DEV i'm trying to 'buildworld' with 'gcc44' as # CCVER=gcc44 make buildworld buildworld is not warning-free with gcc44. You need to also set NO_WERROR. Peter thank you for your reply. Yes, i could successfully do the buildworld+installworld with CCVER=gcc44 make -DNO_WERROR buildworld thanks Saifi.
Re: tcsh-6 compilation error with gcc44 (buildworld)
On Sat, 7 Nov 2009, Sascha Wildner wrote: Peter Avalos schrieb: On Sat, Nov 07, 2009 at 09:49:50PM +0530, Saifi Khan wrote: Hi: On a AMD64X2 system running DragonFly v2.5.1.187.gc1543-DEV i'm trying to 'buildworld' with 'gcc44' as # CCVER=gcc44 make buildworld buildworld is not warning-free with gcc44. You need to also set NO_WERROR. --Peter Same goes for clang. I've committed a fix that restricts -Werror to gcc41 for now. Sascha Sascha, i did a git pull to pull in your commit http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/5623ae32853fcfb747f493ea6af0059a56fb9b56 However, i encountered the *same error* while building tcsh-6, on running this command: CCVER=gcc44 make buildworld So, i specified the macro -DNO_WERROR and the ran the command: CCVER=gcc44 make -DNO_WERROR buildworld This works absolutely fine. Pls note that /etc/make.conf doesnot exist on the system. Is there a possibility that some other .mk file needs to be reviewed as well ? thanks Saifi.
Re: some git usage related queries
On Sun, Nov 08, 2009 at 02:12:24PM +0530, Saifi Khan wrote: Hi: Here are some git usage related newbie queries. 1. i read a notification about a new commit eg. pkgsrc commit http://gitweb.dragonflybsd.org/pkgsrc.git/commit/4ceab3c0055ed6bdacff399294ff8ef253b99468 Since i maintain a local git repo for pkgsrc, i'd like to know the diff between what i got and what's in the latest commit. What command do i run locally to see the diff ? git diff 4ceab3c0055ed6bdacff399294ff8ef253b99468 This only works if you've updated your remotes though (git fetch or git remote update) 2. i've pulled in latest commits using 'git pull'. While working with local repository, i want to know the diff between the last commit and the latest commit for a given file eg. nrelease/Makefile. what i tried doing was: # cd /usr/src # cd nrelease # git diff HEAD^ HEAD ./Makefile # This doesn't work. What is the correct approach here ? I'm not exactly sure what you're trying to do, but I guess you're going for: git log -p Makefile 3. after pulling in the changes related to Sascha's commit eg. when i tried this command: # git describe 5623ae32853fcfb747f493ea6af0059a56fb9b56 v2.5.1-200-g5623ae3 This doesn't show up the details of the commit. What would be the appropriate command to use ? git show 5623ae32853fcfb747f493ea6af0059a56fb9b56 4. i apply some patches to a given file eg. Stathis' patch for mq*() syscall for MPSAFE # cd /usr/src # fetch http://leaf.dragonflybsd.org/~beket/mq-mpsafe.diff # git apply mq-mpsafe.diff Ideally i should have created a branch and then apply the patch. However, i applied the patch to the master. Some new files are created and some .bak files created. When i 'git pull' next, there are issues. What is a good practice to adopt here ? Lots of options for this...I would create a new branch, commit the change, then use git rebase to bring in any new changes. Is there also something as 'unapply' a patch in git ? git reset i've readup Pragmatic version control with Git and GitUsage documentation in the wiki. So, while i can get around with basic Git commands, i'm still facing issues. i'd be grateful, if some of experienced folks on the project can share their nuggets of wisdom on this. Thanks for any help. Try the manual pages or git help too. --Peter pgp4ysK84r3AB.pgp Description: PGP signature
Trouble installing DragonFly under qemu-kvm
Hi Folks, I'm trying to install DragonFly under qemu, using an ISO (this one's yesterday's snapshot, I think). It boots fine, I'm able to login as root and everything seems to work OK. When I try to login as installer, however, I get the following error message: = Starting installer. Reading /etc/pfi.conf ... Unsupported DFUI transport '' . = It then logs me out. Does anybody know of a workaround? This is how I'm invoking qemu: qemu -m 512 -smp 1 -enable-kvm -net nic -net user -cdrom LATEST-i386-master.iso -hda ./df.img -boot d Thanks, Karthik.
Re: Trouble installing DragonFly under qemu-kvm
Karthik Subramanian schrieb: Hi Folks, I'm trying to install DragonFly under qemu, using an ISO (this one's yesterday's snapshot, I think). It boots fine, I'm able to login as root and everything seems to work OK. When I try to login as installer, however, I get the following error message: = Starting installer. Reading /etc/pfi.conf ... Unsupported DFUI transport '' . = It then logs me out. Does anybody know of a workaround? This is how I'm invoking qemu: qemu -m 512 -smp 1 -enable-kvm -net nic -net user -cdrom LATEST-i386-master.iso -hda ./df.img -boot d Can you login as root instead and check if the /etc/defaults/pfi.conf file is there? There was an issue on recent ISOs which caused them to not have this file. But it was fixed on the 5th. Sascha -- http://yoyodyne.ath.cx
Re: Trouble installing DragonFly under qemu-kvm
On Sun, Nov 8, 2009 at 4:05 PM, Sascha Wildner s...@online.de wrote: Karthik Subramanian schrieb: Hi Folks, I'm trying to install DragonFly under qemu, using an ISO (this one's yesterday's snapshot, I think). It boots fine, I'm able to login as root and everything seems to work OK. When I try to login as installer, however, I get the following error message: = Starting installer. Reading /etc/pfi.conf ... Unsupported DFUI transport '' . = It then logs me out. Does anybody know of a workaround? This is how I'm invoking qemu: qemu -m 512 -smp 1 -enable-kvm -net nic -net user -cdrom LATEST-i386-master.iso -hda ./df.img -boot d Can you login as root instead and check if the /etc/defaults/pfi.conf file is there? There was an issue on recent ISOs which caused them to not have this file. But it was fixed on the 5th. Thanks, Sascha. It turns out that the ISO that I was using is earlier than yesterday's snapshot. So yes, it doesn't have /etc/defaults/pfi.conf. I'll download today's snapshot and use that instead. Karthik.
Re: tcsh-6 compilation error with gcc44 (buildworld)
Saifi Khan schrieb: On Sat, 7 Nov 2009, Sascha Wildner wrote: Peter Avalos schrieb: On Sat, Nov 07, 2009 at 09:49:50PM +0530, Saifi Khan wrote: Hi: On a AMD64X2 system running DragonFly v2.5.1.187.gc1543-DEV i'm trying to 'buildworld' with 'gcc44' as # CCVER=gcc44 make buildworld buildworld is not warning-free with gcc44. You need to also set NO_WERROR. --Peter Same goes for clang. I've committed a fix that restricts -Werror to gcc41 for now. Sascha Sascha, i did a git pull to pull in your commit http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/5623ae32853fcfb747f493ea6af0059a56fb9b56 However, i encountered the *same error* while building tcsh-6, on running this command: CCVER=gcc44 make buildworld So, i specified the macro -DNO_WERROR and the ran the command: CCVER=gcc44 make -DNO_WERROR buildworld This works absolutely fine. Pls note that /etc/make.conf doesnot exist on the system. Is there a possibility that some other .mk file needs to be reviewed as well ? I assume that in this scenario, bsd.sys.mk is updated in your src/ but not on your host (/usr/share/mk/bsd.sys.mk). However, gethost.nx (the program your build fails on) is built using host tools, so the bsd.sys.mk file from /usr/share/mk is taken which hasn't got the fix. If you update it (e.g. quickly by 'cp share/mk/bsd.sys.mk /usr/share/mk) you should no longer need -DNO_WERROR for gcc44. Sascha -- http://yoyodyne.ath.cx
Re: some git usage related queries
2009/11/8 Saifi Khan saifi.k...@datasynergy.org: 4. i apply some patches to a given file eg. Stathis' patch for mq*() syscall for MPSAFE # cd /usr/src # fetch http://leaf.dragonflybsd.org/~beket/mq-mpsafe.diff # git apply mq-mpsafe.diff Ideally i should have created a branch and then apply the patch. However, i applied the patch to the master. Some new files are created and some .bak files created. When i 'git pull' next, there are issues. What is a good practice to adopt here ? Is there also something as 'unapply' a patch in git ? The right way is to use git reset as Peter said. Something like git reset --hard HEAD. But be aware that this will reset all uncommitted changes in your index and your working tree. So, if besides my patch you have other stuff that you care about, take your measures. Don't be tempted to do sth like git checkout HEAD -- path/to/file as this will use index to restore your file. And since you used git-apply, your index is contaminated. In order to remove untracked files use git clean -f -d. i'd be grateful, if some of experienced folks on the project can share their nuggets of wisdom on this. Thanks for any help. Feel free to ask, whatever you don't get from the docs. Cheers, Stathis
Re: Trouble installing DragonFly under qemu-kvm
On Sun, Nov 8, 2009 at 4:26 PM, Karthik Subramanian karthik301...@gmail.com wrote: On Sun, Nov 8, 2009 at 4:05 PM, Sascha Wildner s...@online.de wrote: Karthik Subramanian schrieb: Hi Folks, I'm trying to install DragonFly under qemu, using an ISO (this one's yesterday's snapshot, I think). It boots fine, I'm able to login as root and everything seems to work OK. When I try to login as installer, however, I get the following error message: = Starting installer. Reading /etc/pfi.conf ... Unsupported DFUI transport '' . = It then logs me out. Does anybody know of a workaround? This is how I'm invoking qemu: qemu -m 512 -smp 1 -enable-kvm -net nic -net user -cdrom LATEST-i386-master.iso -hda ./df.img -boot d Can you login as root instead and check if the /etc/defaults/pfi.conf file is there? There was an issue on recent ISOs which caused them to not have this file. But it was fixed on the 5th. Thanks, Sascha. It turns out that the ISO that I was using is earlier than yesterday's snapshot. So yes, it doesn't have /etc/defaults/pfi.conf. I'll download today's snapshot and use that instead. Karthik. Today's snapshot worked! Thanks. Sascha. Karthik.
Re: Suggestion fix for ikiwiki search results
Ok, thank you for filing a bug report about this Justin. I will look at getting the man pages indexed in xapian next. Where on leaf, can I find the web-formated man pages? Cheers, Danny. On Nov 8, 2009, at 5:17 AM, jus...@shiningsilence.com wrote: There's a slightly newer version of ikiwiki that should be installed first, though, as there's been a few quick minor releases. If I can't get it upgraded tonight, I'll get it done this weekend. It's upgraded. I filed a bug report about search results for ikiwiki; maybe this can get fixed in the system: http://ikiwiki.info/bugs/Search_summary_includes_text_from_navigational_elements/?updated If not, we can patch the search stuff. PGP.sig Description: This is a digitally signed message part
Re: Testing needed: Update BIND to 9.5.2
It seems the mailing list doesn't accept the attachment , so you can download it from here: http://neslonek.homeunix.org/bind_update.patch.gz Jan Lentfer schrieb: Hi, applied patch or http://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/tree/08fede65c5945157ec82978d7e715f4bc03b8459 updates bind from 9.3 to 9.5.2 in base. I have tested on i386 but x86_64 aka amd64 testing and more general testing is needed. Please check if you can do this Kind Regards, Jan Lentfer
Re: GHC on DragonFly?
2009/5/23 G.Isenmann i...@goetz-isenmann.de: There is at least one open problem with rts/Linker.c http://leaf.dragonflybsd.org/mailarchive/users/2009-04/msg00030.html This prevents the use of ghci and the build of e.g. yi. The constant 15 is defined in /usr/include/machine/elf.h as R_386_TLS_IE (Absolute address of GOT for -ve static TLS). This is meaningless to me at the moment. I shall have to dig into it, but if anyone can point me at any useful documentation, it will be appreciated. -- Colin Adams Preston, Lancashire, ENGLAND
HEADS UP: new openssl
Our openssl has been updated to version 0.9.8l which works around CVE-2009-3555 (see for instance http://extendedsubset.com/ or http://www.securityfocus.com/bid/36935). The vulnerability allows data injection by man-in-the-middle attackers, so you are advised to upgrade to the latest version by installing a current world and rebuilding any binaries that are linked statically against openssl. SSH is not affected. The new openssl has also been merged into the 2.4 release branch. If you are running 2.4 or 2.4.1, you can git clone $mirror git checkout origin/DragonFly_RELEASE_2_4 make buildworld make buildkernel make installkernel make installworld make upgrade and restart all daemons that rely on openssl (you can do that by rebooting the machine if you are not sure which those are). Aggelos
Re: Testing needed: Update BIND to 9.5.2
Anywhere works. Also, your leaf account has a publically accessible http area in ~/public_html, accessed via http://leaf.dragonflybsd.org/~username/ Generally speaking the mailing list should not be used to post large attachments. -Matt Matthew Dillon dil...@backplane.com
Re: some git usage related queries
On Sat, 7 Nov 2009, Peter Avalos wrote: On Sun, Nov 08, 2009 at 02:12:24PM +0530, Saifi Khan wrote: Hi: Here are some git usage related newbie queries. Try the manual pages or git help too. Peter and Stathis thank you for the kind help. While studying the recent commits related to mandoc(1), there are two very similar commits: 1. Sascha's mandoc(1) commits (Nov 7) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/0dd4f1472251d685486367a185d3b9d78062f84d 2. Alexander's mandoc(1) commits (Nov 8) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/32c903ac153404697d03cdf54825a041b54dd714 How do i see what are the changes between the two ? thanks Saifi.
Re: some git usage related queries
On Mon, Nov 09, 2009 at 09:17:58AM +0530, Saifi Khan wrote: While studying the recent commits related to mandoc(1), there are two very similar commits: 1. Sascha's mandoc(1) commits (Nov 7) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/0dd4f1472251d685486367a185d3b9d78062f84d 2. Alexander's mandoc(1) commits (Nov 8) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/32c903ac153404697d03cdf54825a041b54dd714 How do i see what are the changes between the two ? git diff 0dd4f1472251d685486367a185d3b9d78062f84d..32c903ac153404697d03cdf54825a041b54dd714 I'm not sure what Alexander did to cause that. Was there a git push -f involved? --Peter pgpNF2kNkd3aM.pgp Description: PGP signature
Cannot unmount namecache|process references
Hi: After completing a installation using the 2.4.1 LiveCD, the system was rebooted. The screen fills up with 'cannot umount: X namecache|process references Please see the photo here http://i818.photobucket.com/albums/zz107/saifikhan/dragonfly/DSC00100.jpg Seen on both x86_64 box and x86 box. Has anybody encountered this ? Is this possibly a bug ? thanks Saifi.
Re: some git usage related queries
On Sun, 8 Nov 2009, Peter Avalos wrote: On Mon, Nov 09, 2009 at 09:17:58AM +0530, Saifi Khan wrote: While studying the recent commits related to mandoc(1), there are two very similar commits: 1. Sascha's mandoc(1) commits (Nov 7) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/0dd4f1472251d685486367a185d3b9d78062f84d 2. Alexander's mandoc(1) commits (Nov 8) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/32c903ac153404697d03cdf54825a041b54dd714 How do i see what are the changes between the two ? git diff 0dd4f1472251d685486367a185d3b9d78062f84d..32c903ac153404697d03cdf54825a041b54dd714 I'm not sure what Alexander did to cause that. Was there a git push -f involved? Thank you Peter for your reply. Yes, i also ran the same command, but it gives an error 'invalid revision range'. Please see the entire log below. -- Script started on Mon Nov 9 10:54:04 2009 $pwd /usr/home/saifi/workarea/dragonfly $ls COPYRIGHT bin/cscope.po.out lib/ sys/ Makefilecontrib/etc/ libexec/tags Makefile.inc1 crypto/ g.log nrelease/ test/ Makefile_upgrade.inccscope.filesgames/ sbin/ tools/ README cscope.in.out gnu/secure/ usr.bin/ UPDATINGcscope.out include/share/ usr.sbin/ $git pull -v From git://chlamydia.fs.ei.tum.de/dragonfly = [up to date] DragonFly_RELEASE_1_10 - origin/DragonFly_RELEASE_1_10 = [up to date] DragonFly_RELEASE_1_12 - origin/DragonFly_RELEASE_1_12 = [up to date] DragonFly_RELEASE_1_2 - origin/DragonFly_RELEASE_1_2 = [up to date] DragonFly_RELEASE_1_4 - origin/DragonFly_RELEASE_1_4 = [up to date] DragonFly_RELEASE_1_6 - origin/DragonFly_RELEASE_1_6 = [up to date] DragonFly_RELEASE_1_8 - origin/DragonFly_RELEASE_1_8 = [up to date] DragonFly_RELEASE_2_0 - origin/DragonFly_RELEASE_2_0 = [up to date] DragonFly_RELEASE_2_2 - origin/DragonFly_RELEASE_2_2 = [up to date] DragonFly_RELEASE_2_4 - origin/DragonFly_RELEASE_2_4 = [up to date] doc- origin/doc = [up to date] master - origin/master = [up to date] netmp - origin/netmp = [up to date] repo/hooks - origin/repo/hooks = [up to date] site - origin/site = [up to date] vendor/ACPICA-UNIX - origin/vendor/ACPICA-UNIX = [up to date] vendor/ATHEROS - origin/vendor/ATHEROS = [up to date] vendor/AWK - origin/vendor/AWK = [up to date] vendor/BIND - origin/vendor/BIND = [up to date] vendor/BINUTILS - origin/vendor/BINUTILS = [up to date] vendor/BINUTILS220 - origin/vendor/BINUTILS220 = [up to date] vendor/BSDINSTALLER - origin/vendor/BSDINSTALLER = [up to date] vendor/BSDTAR - origin/vendor/BSDTAR = [up to date] vendor/BZIP - origin/vendor/BZIP = [up to date] vendor/CVS - origin/vendor/CVS = [up to date] vendor/DHCP - origin/vendor/DHCP = [up to date] vendor/DIFFUTILS - origin/vendor/DIFFUTILS = [up to date] vendor/FILE - origin/vendor/FILE = [up to date] vendor/GCC - origin/vendor/GCC = [up to date] vendor/GCC44 - origin/vendor/GCC44 = [up to date] vendor/GDB - origin/vendor/GDB = [up to date] vendor/GDTOA - origin/vendor/GDTOA = [up to date] vendor/GMP - origin/vendor/GMP = [up to date] vendor/GPERF - origin/vendor/GPERF = [up to date] vendor/GROFF - origin/vendor/GROFF = [up to date] vendor/HEIMDAL - origin/vendor/HEIMDAL = [up to date] vendor/HOSTAPD - origin/vendor/HOSTAPD = [up to date] vendor/INTEL_ACPICA - origin/vendor/INTEL_ACPICA = [up to date] vendor/LESS - origin/vendor/LESS = [up to date] vendor/LIBARCHIVE - origin/vendor/LIBARCHIVE = [up to date] vendor/LIBEVENT - origin/vendor/LIBEVENT = [up to date] vendor/LIBPCAP - origin/vendor/LIBPCAP = [up to date] vendor/LIBSTDC++ - origin/vendor/LIBSTDC++ = [up to date] vendor/LUKEMFTP - origin/vendor/LUKEMFTP = [up to date] vendor/MPFR - origin/vendor/MPFR = [up to date] vendor/NCURSES - origin/vendor/NCURSES = [up to date] vendor/NETGRAPH - origin/vendor/NETGRAPH = [up to date] vendor/NTPD - origin/vendor/NTPD = [up to date] vendor/OPENPAM - origin/vendor/OPENPAM = [up to date] vendor/OPENSSH - origin/vendor/OPENSSH = [up to date] vendor/OPENSSL - origin/vendor/OPENSSL = [up to date] vendor/PAM_PASSWDQC - origin/vendor/PAM_PASSWDQC = [up to date] vendor/READLINE - origin/vendor/READLINE = [up to date] vendor/SENDMAIL -
Re: some git usage related queries
On Sun, 8 Nov 2009, Peter Avalos wrote: On Mon, Nov 09, 2009 at 09:17:58AM +0530, Saifi Khan wrote: While studying the recent commits related to mandoc(1), there are two very similar commits: 1. Sascha's mandoc(1) commits (Nov 7) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/0dd4f1472251d685486367a185d3b9d78062f84d 2. Alexander's mandoc(1) commits (Nov 8) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/32c903ac153404697d03cdf54825a041b54dd714 How do i see what are the changes between the two ? git diff 0dd4f1472251d685486367a185d3b9d78062f84d..32c903ac153404697d03cdf54825a041b54dd714 I'm not sure what Alexander did to cause that. Was there a git push -f involved? Thank you Peter for your reply. Yes, i also ran the same command, but it gives an error 'invalid revision range'. Please see the entire log below. -- Script started on Mon Nov 9 10:54:04 2009 $pwd /usr/home/saifi/workarea/dragonfly $ls COPYRIGHT bin/cscope.po.out lib/ sys/ Makefilecontrib/etc/ libexec/tags Makefile.inc1 crypto/ g.log nrelease/ test/ Makefile_upgrade.inccscope.filesgames/ sbin/ tools/ README cscope.in.out gnu/secure/ usr.bin/ UPDATINGcscope.out include/share/ usr.sbin/ $git pull -v git://chlamydia.fs.ei.tum.de/dragonfly = [up to date] DragonFly_RELEASE_1_10 - origin/DragonFly_RELEASE_1_10 = [up to date] DragonFly_RELEASE_1_12 - origin/DragonFly_RELEASE_1_12 = [up to date] DragonFly_RELEASE_1_2 - origin/DragonFly_RELEASE_1_2 = [up to date] DragonFly_RELEASE_1_4 - origin/DragonFly_RELEASE_1_4 = [up to date] DragonFly_RELEASE_1_6 - origin/DragonFly_RELEASE_1_6 = [up to date] DragonFly_RELEASE_1_8 - origin/DragonFly_RELEASE_1_8 = [up to date] DragonFly_RELEASE_2_0 - origin/DragonFly_RELEASE_2_0 = [up to date] DragonFly_RELEASE_2_2 - origin/DragonFly_RELEASE_2_2 = [up to date] DragonFly_RELEASE_2_4 - origin/DragonFly_RELEASE_2_4 = [up to date] doc- origin/doc = [up to date] master - origin/master = [up to date] netmp - origin/netmp = [up to date] repo/hooks - origin/repo/hooks = [up to date] site - origin/site = [up to date] vendor/ACPICA-UNIX - origin/vendor/ACPICA-UNIX = [up to date] vendor/ATHEROS - origin/vendor/ATHEROS = [up to date] vendor/AWK - origin/vendor/AWK = [up to date] vendor/BIND - origin/vendor/BIND = [up to date] vendor/BINUTILS - origin/vendor/BINUTILS = [up to date] vendor/BINUTILS220 - origin/vendor/BINUTILS220 = [up to date] vendor/BSDINSTALLER - origin/vendor/BSDINSTALLER = [up to date] vendor/BSDTAR - origin/vendor/BSDTAR = [up to date] vendor/BZIP - origin/vendor/BZIP = [up to date] vendor/CVS - origin/vendor/CVS = [up to date] vendor/DHCP - origin/vendor/DHCP = [up to date] vendor/DIFFUTILS - origin/vendor/DIFFUTILS = [up to date] vendor/FILE - origin/vendor/FILE = [up to date] vendor/GCC - origin/vendor/GCC = [up to date] vendor/GCC44 - origin/vendor/GCC44 = [up to date] vendor/GDB - origin/vendor/GDB = [up to date] vendor/GDTOA - origin/vendor/GDTOA = [up to date] vendor/GMP - origin/vendor/GMP = [up to date] vendor/GPERF - origin/vendor/GPERF = [up to date] vendor/GROFF - origin/vendor/GROFF = [up to date] vendor/HEIMDAL - origin/vendor/HEIMDAL = [up to date] vendor/HOSTAPD - origin/vendor/HOSTAPD = [up to date] vendor/INTEL_ACPICA - origin/vendor/INTEL_ACPICA = [up to date] vendor/LESS - origin/vendor/LESS = [up to date] vendor/LIBARCHIVE - origin/vendor/LIBARCHIVE = [up to date] vendor/LIBEVENT - origin/vendor/LIBEVENT = [up to date] vendor/LIBPCAP - origin/vendor/LIBPCAP = [up to date] vendor/LIBSTDC++ - origin/vendor/LIBSTDC++ = [up to date] vendor/LUKEMFTP - origin/vendor/LUKEMFTP = [up to date] vendor/MPFR - origin/vendor/MPFR = [up to date] vendor/NCURSES - origin/vendor/NCURSES = [up to date] vendor/NETGRAPH - origin/vendor/NETGRAPH = [up to date] vendor/NTPD - origin/vendor/NTPD = [up to date] vendor/OPENPAM - origin/vendor/OPENPAM = [up to date] vendor/OPENSSH - origin/vendor/OPENSSH = [up to date] vendor/OPENSSL - origin/vendor/OPENSSL = [up to date] vendor/PAM_PASSWDQC - origin/vendor/PAM_PASSWDQC = [up to date] vendor/READLINE - origin/vendor/READLINE = [up to date] vendor/SENDMAIL -
Re: some git usage related queries
2009/11/9, Peter Avalos pava...@theshell.com: On Mon, Nov 09, 2009 at 09:17:58AM +0530, Saifi Khan wrote: While studying the recent commits related to mandoc(1), there are two very similar commits: 1. Sascha's mandoc(1) commits (Nov 7) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/0dd4f1472251d685486367a185d3b9d78062f84d 2. Alexander's mandoc(1) commits (Nov 8) 54 files changed, 1349 insertions(+), 730 deletions(-) http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/32c903ac153404697d03cdf54825a041b54dd714 How do i see what are the changes between the two ? git diff 0dd4f1472251d685486367a185d3b9d78062f84d..32c903ac153404697d03cdf54825a041b54dd714 I'm not sure what Alexander did to cause that. Was there a git push -f involved? No git push -f was involved. Maybe the reason is 'rebase -i' I did on newacpi+ branch, I didn't touch or reorder commit but it appeared on the list once :/ Looks like merge is not completely safe to use. Sorry for that.
