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

Re: Merges which involve the addition of a single file broken on trunk

From: Paul Burba <pburba_at_collab.net>
Date: 2007-10-03 17:36:50 CEST

> -----Original Message-----
> From: Daniel Rall [mailto:dlr@finemaltcoding.com]
> Sent: Wednesday, October 03, 2007 11:04 AM
> To: Subversion Developers
> Cc: Kamesh Jayachandran
> Subject: Merges which involve the addition of a single file
> broken on trunk
>
> For a single file added on trunk, I don't seem to be able to
> merge it onto a branch:
>
> $ svn merge -c3 file:///tmp/repos/trunk /tmp/wc/branches/A
> --- Merging r3 into '/tmp/wc/branches/A':
> Skipped '/tmp/wc/branches/A/hello-world.txt'
>
> (Attempts to merge into only the file itself don't work
> because it didn't previously exist on the branch, and haven't
> been expected to work in the past.)
>
> This was not a problem with 1.4.x:
>
> $ /usr/local/subversion-1.4/bin/svn merge -c3
> file:///tmp/repos2/ trunk /tmp/wc2/branches/A
> A /tmp/wc2/branches/A/hello-world.txt
>
> This is a serious regression. While it seems tangentially
> related to issue #2874, I don't think it's the same.
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=2874

Dan,

This scenario is working for me on trunk. That skipped message is
exactly what you'd get if there was an unversioned obstruction to
'/tmp/wc/branches/A/hello-world.txt' prior to the merge (the same
behavior as 1.4.x). Is that possibly what happened here?

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 3 17:40:54 2007

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