On 10/22/06, Martin Bähr <[EMAIL PROTECTED]> wrote: > On Sun, Oct 22, 2006 at 06:29:30PM +0200, Axel Liljencrantz wrote: > > I have no problem with you making a .deb available. > > can i upload it on the fish site somewhere? i don't really have a good > site for it right now. also i wonder how we can be sure that the versions are > synchronized? > > btw, the latest patch gives me a conflict in env_universal_common.c, > which is rather wierd, since i don't change any files. > > v v v v v v v > debug( 2, > ^ ^ ^ ^ ^ ^ ^ > L"Error while sending universal > variable message to fd %d. Closing connection", > fd ); > v v v v v v v > if( debug_level > 2 ) > wperror( L"write" ); > ^ ^ ^ ^ ^ ^ ^
Um, that may be my fault. Sometimes I record a patch only to realise I forgot to save some file, so some non-critical minor edits are left out. If that happens I sometimes unrecord the patch and record a better patch. But if someone happens to download the original patch while it is up, they end up with conflicts. I try not to do this because I know it's bad, but I hate it when the Changelog is full of 'oops, butterfingers again' commits, and I'm not organized enough not to get things wrong sometimes. :-/ If this is the problem, you should have two patches with the same commit message. You should then be able to delete both and pull the right one. > > greetings, martin. > -- > cooperative communication with sTeam - caudium, pike, roxen and unix > offering: programming, training and administration - anywhere in the world > -- > pike programmer travelling and working in europe open-steam.org > unix system- bahai.or.at iaeste.(tuwien.ac|or).at > administrator (caudium|gotpike).org is.schon.org > Martin Bähr http://www.iaeste.or.at/~mbaehr/ > -- Axel ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fish-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/fish-users
