On Sat, 4 May 2013 10:01:19 +0100 (BST) Joe Dalton wrote: svn requires the files you are about to commit are in sync, so you need that flag to commit but the conflict prevent it
then perhaps most easy answer will be: cd to the upper directory and rename your da directory to keep updated files, then svn update and you now have the current copy, then you can bring back the files you've translated svn diff to see whether you havent lost changes here -- victory no need to CC me :-) http://userscripts.org/scripts/show/102724 0.0.1.4 http://userscripts.org/scripts/show/163846 0.0.1 http://userscripts.org/scripts/show/163848 0.0.1 -- To UNSUBSCRIBE, email to debian-i18n-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20130504184327.56066fc1083fb1ea089d8...@gmail.com
