RE: Merge of rename only merged deletion, not addition - file lost

2012-12-13 Thread Asbjørn Sæbø
> From: jcor...@gmail.com > Date: Wed, 12 Dec 2012 18:57:28 +0100 > Subject: Re: Merge of rename only merged deletion, not addition - file lost > To: gaff...@live.com > CC: users@subversion.apache.org > > On Wed, Dec 12, 2012 at

Re: Merge of rename only merged deletion, not addition - file lost

2012-12-12 Thread Johan Corveleyn
On Wed, Dec 12, 2012 at 4:33 PM, Asbjørn Sæbø wrote: > > > Dear TortoiseSVNers, > > We have just seen a case where a file has been lost as a combination > of renaming and merging. We must understand how this could happen, so > that we can avoid similar situations in the future. First important q

Merge of rename only merged deletion, not addition - file lost

2012-12-12 Thread Asbjørn Sæbø
Dear TortoiseSVNers, We have just seen a case where a file has been lost as a combination of renaming and merging.  We must understand how this could happen, so that we can avoid similar situations in the future. What happened: 1 Our "product branch" (think of it as our trunk) was branched, to