On Fri, Apr 18, 2008 at 11:58:42AM -0700, Eric Gillespie wrote:
> If you do a merge that should Add a file, but you already have
> this file unversioned in your working copy (say, because you've
> just switched a copy from trunk (which has the file) to your
> branch), svn merge Skips it. The Skip notice is lost in the
> noise,
Eric, this is one of the cases we're trying to handle on the
tree-conflicts branch. Thanks a lot for your report, we're at it :)
> but worse, the mergeinfo claims the file is there. So,
> even after you remove the unversioned file (which you shouldn't
> have to do anyway), svn merge still won't pick it up.
This is bad. Handing over to merge-tracking team.
> Reproduction recipe:
>
> svn co http://svn.collab.net/repos/svn/trunk bugwc
> cd bugwc
> svn sw http://svn.collab.net/repos/svn/branches/svnserve-logging
> svn st notes/tree-conflicts/policy.txt
> ? notes/tree-conflicts/policy.txt
> svn merge --accept=theirs-full http://svn.collab.net/repos/svn/trunk
> --- Merging r30413 through r30687 into '.':
> U Makefile.in
> U www/faq.html
> U www/svn_1.5_releasenotes.html
> U COMMITTERS
> Skipped 'notes/tree-conflicts/policy.txt'
>
> 0 trunk3% svn --version
> svn, version 1.5.0 (dev build)
> compiled Apr 15 2008, 14:50:17
>
> --
> Eric Gillespie <*> epg_at_pretzelnet.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
--
Stefan Sperling <stsp_at_elego.de> Software Developer
elego Software Solutions GmbH HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12 Tel: +49 30 23 45 86 96
13355 Berlin Fax: +49 30 23 45 86 95
http://www.elego.de Geschaeftsfuehrer: Olaf Wagner
- application/pgp-signature attachment: stored
Received on 2008-04-18 21:09:02 CEST