[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: Srilakshmanan, Lakshman <Lakshman.Srilakshmanan_at_tradingpost.com.au>
Date: 2006-11-03 03:51:39 CET

Hi Damien,

The problem is because FileName.java was added into trunk & branch. You
should add a file ONLY once into a project.

The solution is to delete the FileName.java from your branch (assuming
the trunk version and your branch copy are identical) and then attempt a
merge.

Thanks
Lakshman

> -----Original Message-----
> From: Damien Tougas [mailto:dtougas@bates.edu]
> Sent: Friday, 3 November 2006 7:48 AM
> To: "mailto:users"@subversion.tigris.org
> Subject: Merge problem
>
> 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?
>
> Thanks.
>
> --
> Damien Tougas
> Web Programmer/Analyst
> Bates College
> 207-786-8329
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 3 04:56:56 2006

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