You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Eric Gillespie <ep...@pretzelnet.org> on 2008/04/18 18:58:42 UTC
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
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@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merge-tracking bug
Posted by David Glasser <gl...@davidglasser.net>.
On Fri, Apr 18, 2008 at 12:30 PM, David Glasser
<gl...@davidglasser.net> wrote:
> On Fri, Apr 18, 2008 at 12:28 PM, Eric Gillespie <ep...@pretzelnet.org> wrote:
> > "Kamesh Jayachandran" <ka...@collab.net> writes:
> >
> > > Eric,
> > >
> > > 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
> >
> > My reproduction recipe doesn't work for me, either. Maybe the
> > working copy has to have a lot of other unversioned files lying
> > around, I don't know. The wc in which I actually hit this
> > problem was pretty busy, but I can promise you that I never
> > modified policy.txt.
>
> Presumably y'all can't reproduce it because r30688 actually added the file...?
Oh, never mind, sw -r30687 doesn't leave it around either.
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merge-tracking bug
Posted by David Glasser <gl...@davidglasser.net>.
On Fri, Apr 18, 2008 at 12:28 PM, Eric Gillespie <ep...@pretzelnet.org> wrote:
> "Kamesh Jayachandran" <ka...@collab.net> writes:
>
> > Eric,
> >
> > 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
>
> My reproduction recipe doesn't work for me, either. Maybe the
> working copy has to have a lot of other unversioned files lying
> around, I don't know. The wc in which I actually hit this
> problem was pretty busy, but I can promise you that I never
> modified policy.txt.
Presumably y'all can't reproduce it because r30688 actually added the file...?
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merge-tracking bug
Posted by Eric Gillespie <ep...@pretzelnet.org>.
"Kamesh Jayachandran" <ka...@collab.net> writes:
> Eric,
>
> 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
My reproduction recipe doesn't work for me, either. Maybe the
working copy has to have a lot of other unversioned files lying
around, I don't know. The wc in which I actually hit this
problem was pretty busy, but I can promise you that I never
modified policy.txt.
--
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Merge-tracking bug
Posted by Kamesh Jayachandran <ka...@collab.net>.
Eric,
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@gould.diplodocus.org on behalf of Eric Gillespie
Sent: Sat 4/19/2008 12:28 AM
To: dev@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
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@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merge-tracking bug
Posted by Mark Phippard <ma...@gmail.com>.
On Fri, Apr 18, 2008 at 2:58 PM, Eric Gillespie <ep...@pretzelnet.org> 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, 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.
Hmmm. It is not obvious to me what we should do here. Maybe abort?
I believe the skipped behavior has always been there, and we cannot
set any mergeinfo because to do that we need to have the file.
We might ultimately need the tree-conflicts code before this can be dealt with.
Did you have any ideas?
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merge-tracking bug
Posted by Stefan Sperling <st...@elego.de>.
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@pretzelnet.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
--
Stefan Sperling <st...@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