Problem with "Skipped missing target" after a merge
From: Babak S. H. <babak.sayyid_at_gmail.com>
Date: Fri, 3 Oct 2008 01:56:17 +0200
Dear Subversion users,
1) A virgin repository is created (https://chucky:8443/svn/rep1) containing
2) Repository is checked out in a working copy:
A wc\trunk
3) Code project folder "proj" is copied into trunk. Folder "proj"
4) "proj" is added to be version managed via svn:
A wc\trunk\proj
Adding wc\trunk\proj
5) A private feature branch is created from trunk into branches:
Committed revision 3.
6) Working copy is sync'ed with repository:
7) Now we rename in [wc/trunk/proj] test.cpp to xyz.cpp (off course via svn)
*svn commit -m "Moved test.cpp to xyz.cpp"*
Committed revision 4.
8) Directory is changed to [wc/branches].
--- Merging r3 through r4 into 'proj':
9) In [wc/branches/proj] we modify the content of xyz.cpp and commit it
10) Now we want to merge back the work in our branch into the
*svn merge --dry-run -r 3:6 https://chucky:8443/svn/rep1/branches/projproj
--- Merging r4 through r6 into 'proj\xyz.cpp':
We wonder about the skipped missing target (proj\test.cpp) message which
Any hints ?
-- Regards. Babak Sayyid HosseiniReceived on 2008-10-03 06:39:32 CEST |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.