What does "svn status" give you? If it gives you a "C" on
the first column of a list of files, it means there's a
conflict for that file; hence the commit will fail.
>-----Original Message-----
>From: Martin Tomes [mailto:lists@tomes.org]
>Sent: Thursday, March 08, 2007 11:28 AM
>To: users@subversion.tigris.org
>Subject: How do I determine if a commit of a property change
>will succeed
>
>I am trying to write a script to automate our branching
>procedure which uses svnmerge. Therefore I have to run
>svnmerge init followed by an svn commit of the top level
>directory property change. The problem is that if someone has
>made a change to the contents of that directory and committed
>the change but has not done an update the commit will fail
>because the directory is out of date.
>
>Is there any way (using the command line svn client) that I
>can work out in advance that this commit will fail?
>
>svn info of the directory and its contents give no clue that
>the update is needed.
>
>To spell it out, if I have a file structure like this:
>
>d1/
> d2/
> d3/
> file2
> file3
>
>and I delete d2 and commit d1.
>
>Then I do:
>
>svnmerge init -f commitmsg.txt
>svn commit --non-recursive --file commitmsg.txt .
>
>The svn commit will fail.
>
>--
>Martin Tomes
>echo 'martin at tomes x org x uk'\
> | sed -e 's/ x /\./g' -e 's/ at /@/'
>
>Visit http://www.subversionary.org/
>
>--
>This message has been scanned for viruses and dangerous
>content by MailScanner, and is believed to be clean.
>
>---------------------------------------------------------------------
>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 Thu Mar 8 18:27:25 2007