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

[BUG] Merge does not pick up svn copy WC URL

From: Francois Beausoleil <fbos_at_users.sourceforge.net>
Date: 2004-02-09 05:08:29 CET

Hi,

The following recipe does behave as I would expect:
rd /s/q repos wc
cls
svn --version
svnadmin create repos
svn checkout file:///repos wc
cd wc
mkdir trunk tags branches
cd trunk
echo "fileA" >fileA.java
cd ..
svn add trunk tags branches
svn commit --message "initial version"
cd trunk
echo "fileB" >fileB.java
svn add fileB.java
svn copy . file:///repos/branches/temp --message "Creating temporary
branch"
svn revert -R .
del fileB.java
cd ..
svn update
cd branches\temp
echo "fileC" >fileC.java
svn add fileC.java
svn commit --message "Adding fileC"
cd ..\..\trunk
svn merge --dry-run --revision 2:head file:///repos/branches/temp
svn merge --revision 2:head file:///repos/branches/temp

Should the final merge have picked up fileB.java ? In my opinion, yes.

I copied a sample run at the end of this mail message.

Bye !
François

K:\>svn --version
svn, version 0.37.0 (r8509)
   compiled Jan 25 2004, 22:51:07

Copyright (C) 2000-2004 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/

The following repository access (RA) modules are available:

* ra_dav : Module for accessing a repository via WebDAV (DeltaV)
protocol.
  - handles 'http' schema
  - handles 'https' schema
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' schema
* ra_svn : Module for accessing a repository using the svn network
protocol.
  - handles 'svn' schema

K:\>svnadmin create repos

K:\>svn checkout file:///repos wc
Checked out revision 0.

K:\>cd wc

K:\wc>mkdir trunk tags branches

K:\wc>cd trunk

K:\wc\trunk>echo "fileA" 1>fileA.java

K:\wc\trunk>cd ..

K:\wc>svn add trunk tags branches
A trunk
A trunk\fileA.java
A tags
A branches

K:\wc>svn commit --message "initial version"
Adding branches
Adding tags
Adding trunk
Adding trunk\fileA.java
Transmitting file data .
Committed revision 1.

K:\wc>cd trunk

K:\wc\trunk>echo "fileB" 1>fileB.java

K:\wc\trunk>svn add fileB.java
A fileB.java

K:\wc\trunk>svn copy . file:///repos/branches/temp --message "Creating
temporary
 branch"

Committed revision 2.

K:\wc\trunk>svn revert -R .
Reverted 'fileB.java'

K:\wc\trunk>del fileB.java

K:\wc\trunk>cd ..

K:\wc>svn update
A branches\temp
A branches\temp\fileA.java
A branches\temp\fileB.java
Updated to revision 2.

K:\wc>cd branches\temp

K:\wc\branches\temp>echo "fileC" 1>fileC.java

K:\wc\branches\temp>svn add fileC.java
A fileC.java

K:\wc\branches\temp>svn commit --message "Adding fileC"
Adding temp\fileC.java
Transmitting file data .
Committed revision 3.

K:\wc\branches\temp>cd ..\..\trunk

K:\wc\trunk>svn merge --dry-run --revision 2:head
file:///repos/branches/temp
A fileC.java

K:\wc\trunk>svn merge --revision 2:head file:///repos/branches/temp
A fileC.java

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Feb 9 05:08:45 2004

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