[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merge-tracking bug

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Sat, 19 Apr 2008 00:47:12 +0530


I am not getting this error in my 1.5.0-RC3 build.

The second switch does not leave any stray notes/tree-conflicts/policy.txt

IIRC when a merge encounters a skipped children it sets the non-inheritable mergeinfo on the parent to skipped target and the unskipped sibling targets.

With regards
Kamesh Jayachandran

-----Original Message-----
From: epg_at_gould.diplodocus.org on behalf of Eric Gillespie
Sent: Sat 4/19/2008 12:28 AM
To: dev_at_subversion.tigris.org
Subject: Merge-tracking bug
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, 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.

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
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
Received on 2008-04-18 21:20:07 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.