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

Re: Merge problem

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2006-11-02 22:08:25 CET

On 11/2/06, Damien Tougas <dtougas@bates.edu> wrote:
> Hello,
>
> I am having a problem doing a merge, here are all the steps I am
> following:
>
> svn co https://repository/path/project/trunk
>
> ... (checkout happens) ...
>
> cd trunk
> svn merge -r12345:HEAD https://repository/path/project/branches/1.0
>
> ... (merge happens, no conflicts) ...
>
> svn ci -m "merged from branch 1.0"
>
> ... (commit messages, followed by an error) ...
> Replacing src/java/x/FileName.java
> svn: Commit failed (details follow):
> svn: Item '/path/project/trunk/src/java/x/FileName.java' is out of date
>
> Anyone know what could be causing this? I assumed that since I check
> out the trunk just prior to doing the merge that my working copy
> would be up to date. Why would it be stating that it is out of date?

You don't say which version svn you're using. That's usually (and in
this case even more) relevant information. In 1.4 a (large) number of
wc related issues have been fixed a number of them merge-replaces-file
related.

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 2 22:09:04 2006

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