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

trunk update required before merging branch changes

From: Adam Monsen <haircut_at_gmail.com>
Date: Sat, 10 Jan 2009 15:39:12 -0600

I'm trying to write a shell script to demonstrate the merge capabilities
of Subversion 1.5. For some reason, before I commit the merge, I have to
do an update. Can anyone explain why what seems to me like a "special"
or "extra" update is required before the merge?

Here's an outline of what I'm scripting:

1. set up repository on local filesystem
2. make a change on trunk
3. branch from trunk
4. make a change on the branch
5. make a change on the trunk
6. merge branch changes to trunk

I must update the trunk before step #6 or I get the following error:

  svn: Commit failed (details follow):
  svn: Directory '/trunk' is out of date

The complete shell script is here: http://pastey.net/105987

If I pause right before trying to commit the merge and inspect the trunk
dir in the working copy, I see:

  Revision: 3
  Last Changed Rev: 2

And if I actually do the update:

  Revision: 5
  Last Changed Rev: 5

I'm using:

  Operating System: Ubuntu 8.10
  Software: svn, version 1.5.1 (r32289) [command line client]

Adam Monsen
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].

Received on 2009-01-10 22:40:07 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.