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

Problem with following renames in 1.1

From: Folker Schamel <schamel23_at_spinor.com>
Date: 2004-09-04 15:19:49 CEST


Merging within one tree ("merge -r X:Y WC-PATH") nicely follows renames in 1.1.

However, when merging changes from trunk into a branch or vice versa
rename tracking seems to fails.

See the transscript below.

The new 'peg' syntax "merge BRANCH-URL@REV -r X:Y PATH" seems not to help.

I suppose this is a more fundamental problem, but neverthanless:
Are there plans to improve this?


C:\temp\svntest>svnadmin --version
svnadmin, version 1.1.0 (Release Candidate 2)
    compiled Aug 13 2004, 15:20:48

Copyright (C) 2000-2004 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).

C:\temp\svntest>svnadmin create --fs-type fsfs repro

C:\temp\svntest>svn mkdir file:///temp/svntest/repro/trunk -m ""

Committed revision 1.

C:\temp\svntest>svn checkout file:///temp/svntest/repro/trunk wc_trunk
Checked out revision 1.

C:\temp\svntest>echo file1 1>wc_trunk/file1.txt

C:\temp\svntest>echo file2 1>wc_trunk/file2.txt

C:\temp\svntest>echo file3 1>wc_trunk/file3.txt

C:\temp\svntest>svn add wc_trunk/file1.txt
A wc_trunk\file1.txt

C:\temp\svntest>svn add wc_trunk/file2.txt
A wc_trunk\file2.txt

C:\temp\svntest>svn add wc_trunk/file3.txt
A wc_trunk\file3.txt

C:\temp\svntest>svn commit wc_trunk -m ""
Adding wc_trunk\file1.txt
Adding wc_trunk\file2.txt
Adding wc_trunk\file3.txt
Transmitting file data ...
Committed revision 2.

C:\temp\svntest>svn copy file:///temp/svntest/repro/trunk file:///temp/svntest/r
epro/branch -m "Release"

Committed revision 3.

C:\temp\svntest>svn checkout file:///temp/svntest/repro/branch wc_branch
A wc_branch\file2.txt
A wc_branch\file3.txt
A wc_branch\file1.txt
Checked out revision 3.

C:\temp\svntest>svn move wc_trunk/file2.txt wc_trunk/file2_moved_in_trunk.txt
A wc_trunk\file2_moved_in_trunk.txt
D wc_trunk\file2.txt

C:\temp\svntest>svn commit wc_trunk -m "Refactoring"
Deleting wc_trunk\file2.txt
Adding wc_trunk\file2_moved_in_trunk.txt

Committed revision 4.

C:\temp\svntest>svn move wc_branch/file3.txt wc_branch/file3_moved_in_branch.txt

A wc_branch\file3_moved_in_branch.txt
D wc_branch\file3.txt

C:\temp\svntest>svn commit wc_branch -m "Rename in branch"
Deleting wc_branch\file3.txt
Adding wc_branch\file3_moved_in_branch.txt

Committed revision 5.

C:\temp\svntest>echo file1.new.branch (bug fix in branch) 1>wc_branch/file1.txt

C:\temp\svntest>echo file2.new.branch (bug fix in branch) 1>wc_branch/file2.txt

C:\temp\svntest>echo file3.new.branch (bug fix in branch) 1>wc_branch/file3_mov

C:\temp\svntest>svn commit wc_branch -m "Bug fixes in branch"
Sending wc_branch\file1.txt
Sending wc_branch\file2.txt
Sending wc_branch\file3_moved_in_branch.txt
Transmitting file data ...
Committed revision 6.

C:\temp\svntest>svn merge file:///temp/svntest/repro/branch -r 5:6 wc_trunk
Skipped missing target: 'wc_trunk\file2.txt'
Skipped missing target: 'wc_trunk\file3_moved_in_branch.txt'
U wc_trunk\file1.txt



To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Sep 4 15:20:09 2004

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.