Am 11.01.2004 um 00:21 schrieb Ben Hines:
Fink should be able to realize what this is:
WARNING: Unable to parse the line "<<<<<<< libbonobo2.info" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info".
WARNING: Unable to parse the line "=======" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info".
WARNING: Unable to parse the line ">>>>>>> 1.5" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info".
WARNING: Unable to parse the line "<<<<<<< libbonobo2.info" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info".
WARNING: Unable to parse the line "=======" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info".
WARNING: Unable to parse the line ">>>>>>> 1.5" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info".
WARNING: Unable to parse the line "<<<<<<< libbonobo2.info" in "/sw/fink/dists/unstable/main/finkinfo/gnome/libbonobo2.info".
We could have fink notify the user of a possible CVS conflict and offer to remove the file and selfupdate-cvs again. We could also suggest that if they want to keep the changes they should say no and resolve the conflict by hand.
Sounds like a good idea. Maybe throw in a ref to an appropriate FAQ item, too=
Cheers,
Max
------------------------------------------------------- This SF.net email is sponsored by: Perforce Software. Perforce is the Fast Software Configuration Management System offering advanced branching capabilities and atomic changes on 50+ platforms. Free Eval! http://www.perforce.com/perforce/loadprog.html _______________________________________________ Fink-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/fink-devel
