----------------------------------------
> 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 4:33 PM, Asbjørn Sæbø <gaff...@live.com> 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 question is: which version of (Tortoise)SVN was being
> used on the clients which performed the actions below? And the server?
The client is TortoiseSVN, some 1.6 version. (The person in question
is on vacation now, so I can not ask him.)
The server is Subversion 1.6.6.
>
> [ snip ]
>
> > ======================================================
> >
> > 5) 6245 - Merge product branch to active signal branch to keep in sync
> >
> > Revision: 6245
> > Author: nvlsi\sac
> > Date: 11. desember 2012 17:51:16
> > Message:
> > [...] merged the product branch [...] to active signal branch
> > ----
> > [...]
> > Modified : /verification/branches/development/DRGN-740_active_signal
> > Deleted :
> > /verification/branches/development/DRGN-740_active_signal/doc/test_result/030_system_level_test_documentation.dox
> > Modified :
> > /verification/branches/development/DRGN-740_active_signal/framework/builds/DragoonTools.manifest
> > [...]
> >
> > !!!!! Note that only the deletion from 6190 was merged, not the addition of
> > the renamed file !!!!!!!!
> >
>
> One possible explanation could be "user error". It's possible that the
> user who carried out this merge, in his working copy, deleted the file
> /verification/branches/development/DRGN-740_active_signal/doc/test_result/030_system_test_level.dox
> from his working copy, prior to committing the merge result to the
> repository.
User error is of course a possible explanation. But we hold it
unlikely. The developer has been working within SVN for more than
four years now, and is experienced with merging. And nothing unusual
happened during the merge.
> In that case, the user does something to the merge result
> before committing it (this can be seen as a form of "merge conflict
> resolution" done by the user). This could be unintended, for example
> if the user got a tree conflict on that file, and didn't really know
> how to resolve it, and finally ended up deleting it.
As already said, we are not aware of anything like this happening,
in this part of the tree at least.
A somewhat related question: When one re-integrates a branch, does
Subversion merge back the commits, or does it merge the difference
between the branch and the trunk?
With kind regards
Asbjørn
