(sorry, forgot to CC the list) On 12/20/06, Jack Repenning <[EMAIL PROTECTED]> wrote: > On Dec 20, 2006, at 7:30 AM, Konstantin Sobolev wrote: > > > A thousand apologies! I somehow had that files as unversioned files in > > by branch WC. I don't know if it is possible, but a warning in such > > cases would would be great. > > If you're merging over a versioned file that collides with an > unversioned file in the receiving working copy, you _should_ get an > error, shouldn't you? You certainly do if you update and run into > the same situation.
Nope, svn update will simply skip them. Now I understand how I got this problem: 1. Someone commits new file X into trunk. 2. I try to merge this changeset into the branch. svnmerge fetches X and it becomes scheduled for adding (A). 3. svnmerge fails to commit the changes due to some problem, for instance (.) is outdated. 4. I do 'svn revert -R .' folowed by 'svn update'. Now X stays in my WC as an unversioned file. 5. I retry from step (1), but this time 'svn update' silently skips X as I already have a file by that name in my WC. I've found a script to remove all garbage, including unversioned files, quite handy: http://svn.collab.net/repos/svn/trunk/contrib/client-side/svn-clean -- /KoS _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
