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

merge question

From: Snay, Marc <Marc.Snay_at_turner.com>
Date: 2007-11-06 22:29:41 CET

Having a problem with my first attempt at a merge...

 

At repository version 1423 I branched a project from
/root/tags/project/version into /root/branches/project. I have
completed my changes now and they are checked in at repository version
1430 in /root/branches/project. My main trunk for this project is in
/root/development/project. I am now trying to merge my changes from
/root/branches/project into /root/development/project and am running
into errors no matter how I format my merge command. I know from
looking at the repository logs that no changes have been made to the
/root/development/project files between 1423 and 1430, so there
shouldn't be any conflicts, but all of my merge attempts either delete
files that I have added in the branch, or conflict every file that I
have changed and then fail to commit after I have resolved the
conflicts.

 

My best attempt at this so far has been with checking out a copy of both
/root/branches/project and /root/development/project into separate
Working Copies, going into the WC for the development path, and using
'svn merge /root/development/project@1423 /root/branches/project@1430'
but this left every file in a conflict, and failed with a '404 - not
found' error when trying to commit after the conflict resolution. The
file it was committing when the 404 error occurred was not changed in
the branch, and has not changed in the development since before 1423. I
would have expected this file to be skipped in the commit.

 

Any ideas? Also, using version 1.3.1 of svn.

 

Thanks

Marc
Received on Tue Nov 6 22:30:15 2007

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