2014-03-20 0:59 GMT+01:00 sebb <seb...@gmail.com>: > On 19 March 2014 21:57, Matt Benson <gudnabr...@gmail.com> wrote: > > It's not really lost, is it? It can easily be restored. When I do so, > > will you withdraw your -1? > > It so happens that the doap is referenced by projects.a.o so it is > obvious when it disappears from its original SVN location. > > I have no idea whether anything else has gone missing from trunk, so > it's impossible to say whether restoring the doap is suffiicient, or > whether other useful/essential files are no longer present in trunk. > > Sorry but at present I cannot withdraw my -1. >
I don't have much experience when it comes to merging in SVN. I try to avoid it when ever possible. In this case, the merge seems to cause problems. Sebb: do you have a suggestion how to get this right? How do other projects (e.g. JMeter) handle stuff like this? Regards, Benedikt > > > > Matt > > > > On Wed, Mar 19, 2014 at 4:44 PM, sebb <seb...@gmail.com> wrote: > >> On 19 March 2014 18:30, <mben...@apache.org> wrote: > >>> Author: mbenson > >>> Date: Wed Mar 19 18:30:46 2014 > >>> New Revision: 1579340 > >>> > >>> URL: http://svn.apache.org/r1579340 > >>> Log: > >>> make 2.0 branch into trunk > >>> > >>> Added: > >>> commons/proper/proxy/trunk/ > >>> - copied from r1579339, > commons/proper/proxy/branches/version-2.0-work/ > >>> Removed: > >>> commons/proper/proxy/branches/version-2.0-work/ > >>> > >> > >> -1 > >> > >> This has lost at least one important file, i.e. the DOAP. > >> > >> I've not checked to see if there were any other casualties. > >> > >> --------------------------------------------------------------------- > >> To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > >> For additional commands, e-mail: dev-h...@commons.apache.org > >> > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > > For additional commands, e-mail: dev-h...@commons.apache.org > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > For additional commands, e-mail: dev-h...@commons.apache.org > > -- http://people.apache.org/~britter/ http://www.systemoutprintln.de/ http://twitter.com/BenediktRitter http://github.com/britter
