You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Damien Tougas <dt...@bates.edu> on 2006/11/02 20:47:38 UTC
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
Re: Merge problem
Posted by Damien Tougas <dt...@bates.edu>.
On Thu, Nov 02, 2006 at 10:26:02PM +0100, Erik Huelsmann set forth:
>The issues (fixes) I'm talking about are client-side and will
>interoperate with any 1.0+ server version. The collective fixes were
>called wc-replacements and are related to files (with history) ending
>up in a Replace state, which would break the working copy, either
>through 'merge' or copy/move.
I upgraded my client to 1.4 today, and that fixed the problem. Thanks
for the info, I really appreciate it!
--
Damien Tougas
Web Programmer/Analyst
Bates College
207-786-8329
Re: Merge problem
Posted by Erik Huelsmann <eh...@gmail.com>.
On 11/2/06, Damien Tougas <dt...@bates.edu> wrote:
> On Thu, Nov 02, 2006 at 10:08:25PM +0100, Erik Huelsmann set forth:
>
> >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.
>
> Interesting... I am running 1.3.2 on the client and 1.2.3 on the
> server. Perhaps I should look at upgrading.
The issues (fixes) I'm talking about are client-side and will
interoperate with any 1.0+ server version. The collective fixes were
called wc-replacements and are related to files (with history) ending
up in a Replace state, which would break the working copy, either
through 'merge' or copy/move.
HTH,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge problem
Posted by Damien Tougas <dt...@bates.edu>.
On Thu, Nov 02, 2006 at 10:08:25PM +0100, Erik Huelsmann set forth:
>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.
Interesting... I am running 1.3.2 on the client and 1.2.3 on the
server. Perhaps I should look at upgrading.
--
Damien Tougas
Web Programmer/Analyst
Bates College
207-786-8329
Re: Merge problem
Posted by Erik Huelsmann <eh...@gmail.com>.
On 11/2/06, Damien Tougas <dt...@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
Re: Merge problem
Posted by Elyahu Eaton <El...@Sun.COM>.
Hi,
Is it up-to-date ? What happens if you do an "svn update" ?
Can it be that another process on that workspace is somehow
automatically started or your commit was aborted due to conflicts with
process ?
As far as I know (its not a lot) I got that message when two parallel
commits/updates were done on the same workspace by mistake
Tell up how you got progressed ?
Thanks,
Eli.
Damien Tougas 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?
>
> Thanks.
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org