Re: commit your changes or stash them before you can merge - I didn't change anything :-(
On Thu, May 20, 2010 at 7:42 PM, Pierre Abbat wrote: > > I've gotten that when updating the source after applying a kernel patch. I > just deleted the patched file. > I wonder how my file changed. I never applied the patch or knew such a file existed to change it :-( --Siju
Re: commit your changes or stash them before you can merge - I didn't change anything :-(
On Thu, May 20, 2010 at 5:11 PM, Stathis Kamperis wrote: > Just like git says, you have a modified version of the file > 'lib/libc/uuid/uuid_name_lookup.c'. > I wonder how that happened :-( All I modified was GENERIC.MP which is a copy of GENERIC config file with SMP and APIC stuff uncommented. > When you do a 'git pull', you tell git to fetch remote changes and > merge them with your local tree. If git does so, the remote copy will > overwrite your local copy of the file we discuss. Here git tries to > protect you from losing any work you've done on the file, by stopping > the merge. > Oh thanks for the explanation :-) > Also, make sure that you are on the right branch when you 'git pull'. > > This should fixed it. If not, feel free to write back :) > Yes it is fixed :-) Thanks a lot --Siju
Re: commit your changes or stash them before you can merge - I didn't change anything :-(
On Thu, May 20, 2010 at 7:16 PM, Sdävtaker wrote: > if you are sure those changes got no value you can also: > git reset --hard (that will remove the changes you have) > Hi Thanks That was easy :-) > git reset --hard Checking out files: 100% (29011/29011), done. HEAD is now at d575613 scsi(4): Add a missing 'break'. > git pull remote: Counting objects: 9, done. remote: Compressing objects: 100% (5/5), done. remote: Total 5 (delta 4), reused 0 (delta 0) Unpacking objects: 100% (5/5), done. >From git://git.dragonflybsd.org/dragonfly 04db1b2..c921db9 master -> origin/master Updating d575613..c921db9 Fast-forward lib/libc/uuid/uuid_name_lookup.c |2 +- share/misc/bsd-family-tree |4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) > --Siju
Re: Serious issue with HTTP redirect from dragonflybsd.org to www.dragonflybsd.org
On Thu, May 20, 2010 8:54 am, Daniel Bond wrote: > Hi, > > when redirecting from http://dragonflybsd.org to > http://www.dragonflybsd.org, the PATH-part of the URI is appended to > the TLD. > IE: 'http://dragonflybsd.org/mirrors' redirects to > 'http://www.dragonflybsd.orgmirrors' As I recall, the reason for the setup is because of something with mail, so it couldn't just be aliased directly. In any case, there's probably just a missing '/' in the redirect. This is I think happening on crater, so Matt would have to adjust it.
Re: commit your changes or stash them before you can merge - I didn't change anything :-(
On Thursday 20 May 2010 06:57:44 Siju George wrote: > error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would > be overwritten by merge. Aborting. > Please, commit your changes or stash them before you can merge. I've gotten that when updating the source after applying a kernel patch. I just deleted the patched file. Pierre -- When a barnacle settles down, its brain disintegrates. Já não percebe nada, já não percebe nada.
Re: commit your changes or stash them before you can merge - I didn't change anything :-(
if you are sure those changes got no value you can also: git reset --hard (that will remove the changes you have) On Thu, May 20, 2010 at 06:41, Stathis Kamperis wrote: > 2010/5/20 Siju George : > > Hi, > > > > This is the first time i ever saw this during a source update > > > >> cd /usr/src/ > >> git pull > > remote: Counting objects: 18, done. > > remote: Compressing objects: 100% (10/10), done. > > remote: Total 10 (delta 8), reused 0 (delta 0) > > Unpacking objects: 100% (10/10), done. > > From git://git.dragonflybsd.org/dragonfly > > f4de6f9..8cb6454 DragonFly_RELEASE_2_6 -> origin/DragonFly_RELEASE_2_6 > > d575613..04db1b2 master -> origin/master > > Updating d575613..04db1b2 > > error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would > > be overwritten by merge. Aborting. > > Please, commit your changes or stash them before you can merge. > >> cd /usr/ > >> make src-update > > cd /usr/src && git pull > > Updating d575613..04db1b2 > > error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would > > be overwritten by merge. Aborting. > > Please, commit your changes or stash them before you can merge. > > *** Error code 1 > > > > Stop in /usr. > >> > > > > Current Versiob is > > > > 2.7-DEVELOPMENT DragonFly v2.7.3.44.gd5756-DEVELOPMENT #0: Wed May 19 > > 07:37:57 IST 2010 > > > > Thanks > > > > --Siju > > > > Just like git says, you have a modified version of the file > 'lib/libc/uuid/uuid_name_lookup.c'. > > When you do a 'git pull', you tell git to fetch remote changes and > merge them with your local tree. If git does so, the remote copy will > overwrite your local copy of the file we discuss. Here git tries to > protect you from losing any work you've done on the file, by stopping > the merge. > > Again, just like the error message says, you have to either 'git > stash' or 'git add && git commit -m "foo"'. My guess is that > you haven't manually edited the file or you don't care about it. In > this case do: > > git checkout HEAD -- lib/libc/uuid/uuid_name_lookup.c > git pull > > Also, make sure that you are on the right branch when you 'git pull'. > > This should fixed it. If not, feel free to write back :) > > > Cheers, > Stathis > > -- http://dfbsd.trackbsd.org.ar
Serious issue with HTTP redirect from dragonflybsd.org to www.dragonflybsd.org
Hi, when redirecting from http://dragonflybsd.org to http://www.dragonflybsd.org, the PATH-part of the URI is appended to the TLD. IE: 'http://dragonflybsd.org/mirrors' redirects to 'http://www.dragonflybsd.orgmirrors' I wanted to fix it, but lack permissions to do so. Could "dragonflybsd.org" just be aliased to "www.dragonflybsd.org", or vice-versa? This would make accessing the site faster for clients, and save an extra request on the server. Maybee there is a reason for doing so? Dosn't really matter, as long as the redirect works. Med vennelig hilsen / Best regards Daniel Bond Bond Consulting
Re: commit your changes or stash them before you can merge - I didn't change anything :-(
2010/5/20 Siju George : > Hi, > > This is the first time i ever saw this during a source update > >> cd /usr/src/ >> git pull > remote: Counting objects: 18, done. > remote: Compressing objects: 100% (10/10), done. > remote: Total 10 (delta 8), reused 0 (delta 0) > Unpacking objects: 100% (10/10), done. > From git://git.dragonflybsd.org/dragonfly > f4de6f9..8cb6454 DragonFly_RELEASE_2_6 -> origin/DragonFly_RELEASE_2_6 > d575613..04db1b2 master -> origin/master > Updating d575613..04db1b2 > error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would > be overwritten by merge. Aborting. > Please, commit your changes or stash them before you can merge. >> cd /usr/ >> make src-update > cd /usr/src && git pull > Updating d575613..04db1b2 > error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would > be overwritten by merge. Aborting. > Please, commit your changes or stash them before you can merge. > *** Error code 1 > > Stop in /usr. >> > > Current Versiob is > > 2.7-DEVELOPMENT DragonFly v2.7.3.44.gd5756-DEVELOPMENT #0: Wed May 19 > 07:37:57 IST 2010 > > Thanks > > --Siju > Just like git says, you have a modified version of the file 'lib/libc/uuid/uuid_name_lookup.c'. When you do a 'git pull', you tell git to fetch remote changes and merge them with your local tree. If git does so, the remote copy will overwrite your local copy of the file we discuss. Here git tries to protect you from losing any work you've done on the file, by stopping the merge. Again, just like the error message says, you have to either 'git stash' or 'git add && git commit -m "foo"'. My guess is that you haven't manually edited the file or you don't care about it. In this case do: git checkout HEAD -- lib/libc/uuid/uuid_name_lookup.c git pull Also, make sure that you are on the right branch when you 'git pull'. This should fixed it. If not, feel free to write back :) Cheers, Stathis
Re: anybody knows how to get tclkit successfully built under dfly?
On Thu, May 20, 2010 at 4:34 PM, Siju George wrote: > On Thu, May 20, 2010 at 4:30 PM, Antonio Huete Jimenez > wrote: >> Hi, >> >> I don't know if it builds in DF, but have you tried keepass? >> http://pkgsrc.se/security/keepassx >> >> It is in security/keepassx. >> > > nope :-( the problem is many of the password files are shared using > subversion with Windows Admins too they are using ( > http://passwordsafe.sourceforge.net/ ) :-( > only Password Gorilla is compatible with the password database format > in my knowledge. > And I tried commandline pwsafe from pkgsrc but it does not open my password databases :-( thanks --Siju
Re: anybody knows how to get tclkit successfully built under dfly?
On Thu, May 20, 2010 at 4:30 PM, Antonio Huete Jimenez wrote: > Hi, > > I don't know if it builds in DF, but have you tried keepass? > http://pkgsrc.se/security/keepassx > > It is in security/keepassx. > nope :-( the problem is many of the password files are shared using subversion with Windows Admins too they are using ( http://passwordsafe.sourceforge.net/ ) :-( only Password Gorilla is compatible with the password database format in my knowledge. Thanks :-) --Siju
Re: anybody knows how to get tclkit successfully built under dfly?
Hi, I don't know if it builds in DF, but have you tried keepass? http://pkgsrc.se/security/keepassx It is in security/keepassx. Cheers, Antonio Huete 2010/5/20 Siju George : > Hi, > > I am desperately trying to install 'tclkit' so I can use > > http://www.fpx.de/fp/Software/Gorilla/ > > yes the older version ( 1.4.2 ) I was using with linux. > > It will be great if anybody can let me know what is the best way to > build tclkit or just sent me the binary itself. > > The tclkit documentation on the web is so confusing and I came across > complie errors I was not able to fix. > > Any help would be greatly apppreciated :-) > > thanks > > --Siju > -- Cheers, Antonio Huete
commit your changes or stash them before you can merge - I didn't change anything :-(
Hi, This is the first time i ever saw this during a source update > cd /usr/src/ > git pull remote: Counting objects: 18, done. remote: Compressing objects: 100% (10/10), done. remote: Total 10 (delta 8), reused 0 (delta 0) Unpacking objects: 100% (10/10), done. >From git://git.dragonflybsd.org/dragonfly f4de6f9..8cb6454 DragonFly_RELEASE_2_6 -> origin/DragonFly_RELEASE_2_6 d575613..04db1b2 master -> origin/master Updating d575613..04db1b2 error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. > cd /usr/ > make src-update cd /usr/src && git pull Updating d575613..04db1b2 error: Your local changes to 'lib/libc/uuid/uuid_name_lookup.c' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. *** Error code 1 Stop in /usr. > Current Versiob is 2.7-DEVELOPMENT DragonFly v2.7.3.44.gd5756-DEVELOPMENT #0: Wed May 19 07:37:57 IST 2010 Thanks --Siju
anybody knows how to get tclkit successfully built under dfly?
Hi, I am desperately trying to install 'tclkit' so I can use http://www.fpx.de/fp/Software/Gorilla/ yes the older version ( 1.4.2 ) I was using with linux. It will be great if anybody can let me know what is the best way to build tclkit or just sent me the binary itself. The tclkit documentation on the web is so confusing and I came across complie errors I was not able to fix. Any help would be greatly apppreciated :-) thanks --Siju
