On Jan 8, 2007, at 15:36, Richard Morris wrote:
> I was hoping someone might be able to enlighten me on this problem
> that I am having. I am trying to merge a branch into the trunk but
> when I do it, I get this message about a file is out of date. Here
> is what I am doing to merge the branch (which started at revision
> 86) into the trunk:
>
> mkdir ~/temp
> cd ~/temp
> svn checkout -r 86 http://svn.hddbroker.com/repos/intranet/trunk
You've checked out revision 86 of trunk.
> svn merge --dry-run -r86:HEAD http://svn.hddbroker.com/repos/
> intranet/branches/release-1.2.0
> svn merge -r86:HEAD http://svn.hddbroker.com/repos/intranet/
> branches/release-1.2.0
You've merged in the changes that occurred on the release-1.2.0
branch between revisions 86 and HEAD.
> svn commit -m "Merging the release-1.2.0 branch into the trunk"
>
> No errors occur until I issue the commit command at which point I
> get the following error:
>
> Replacing website/mailinglist/sendnewsletter.php
> svn: Commit failed (details follow):
> svn: Item '/trunk/website/mailinglist/sendnewsletter.php' is out of
> date
You can't commit because, as it says, you're out of date. Your
working copy is not at HEAD; it's at revision 86, plus some changes.
You need to "svn update" first to get up to the HEAD of the trunk.
Then you can commit.
Why did you check out revision 86 in the first place? Why not just
check out the HEAD of the trunk?
> I tried to get the log of the sendnewsletter.php file but I get
> another error message:
>
> cd website/mailinglist/
> svn log sendnewsletter.php
>
> svn: REPORT request failed on '/repos/intranet/!svn/bc/0/trunk/
> website/mailinglist/sendnewsletter.php'
> svn: '/repos/intranet/!svn/bc/0/trunk/website/mailinglist/
> sendnewsletter.php' path not found
>
> During my searches of the mailing list someone had a similar error
> message and was able to get around it by issuing the svn up command
> on the trunk so I tried to do that and go this error message:
>
> svn up
>
> svn: REPORT request failed on '/repos/intranet/!svn/vcc/default'
> svn: Working copy path 'sendnewsletter.php' does not exist in
> repository
>
> I am not exactly sure where to go from here so if someone could
> advise me I would really appreciate it. The only thing that I
> could about that would make this file any different than any other
> file I have committed so far as I believe this file was deleted in
> the repository and then a different file with the same filename was
> added. Not too sure if that would make a difference or not.
Yes, it sounds like, after revision 86, in the release-1.2.0 branch,
sendnewsletter.php was deleted and then another file of the same name
was added. Also, after revision 86, in trunk, sendnewsletter.php was
modified, I think.
Your working copy is of trunk revision 86, plus local changes (merged
from the release-1.2.0 branch) which include deleting
sendnewsletter.php and recreating it. The version of
sendnewsletter.php in your working copy is therefore not linked with
the one that was in the trunk before. Therefore (apparently) you
can't get its log. Try querying the repository by URL. If you want
the log of the item that was in the trunk:
svn log http://svn.hddbroker.com/repos/intranet/trunk/website/
mailinglist/sendnewsletter.php
If you want the log of the item in the release-1.2.0 branch:
svn log http://svn.hddbroker.com/repos/intranet/branches/
release-1.2.0/website/mailinglist/sendnewsletter.php
(My email client will probably destroy those long URLs. Sorry; please
recombine them by hand if necessary.)
The reason you cannot update the working copy now seems to be that
Subversion wants to provide you with changes to sendnewsletter.php
which occurred on trunk between r86 and HEAD, but the object to which
it wants to apply those changes no longer exists (it was deleted by
the merge).
Perhaps someone else can explain how to get out of this situation
now, and how to avoid it in the future, as I'm unclear on these points.
--
To reply to the mailing list, please use your mailer's Reply To All
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 8 22:49:47 2007