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

Re: obstructed merges, loss of files

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-05-09 19:43:18 CEST

On 5/9/06, Jeb <jeb.beasley@penske.com> wrote:
> Greetings
> have large project of 2600 files, 582 folders (including .svn markers etc)
> following these steps we get error message "Obstructed Update" "Revison
> 320 doesn't match existing revision 319"
> We do the following
> Checkout from the repository
> http://server/repos/project/path/branches/offshore/projname into a
> clean empty directory "c:\workspace\projname"
> Switch wc to http://server/repos/project/path/branches/dev_gh/projname
> this seems to properly indicate 6 adds, 56 deletes and 68 updates
> copied a file in another project to bump revision number, or a checkin
> by another developer on another unrelated project
> Merge from http://server/repos/project/path/branches/dev_gh/projname HEAD to
> http://server/repos/project/path/branches/offshore/projname HEAD
> This causes the error and interrupts the merge leaving hundreds of files
> deleted

Can you please show us the actual commands you ran and the error
output you got in response? Just describing them like this makes it
extremely difficult to tell what's actually going on.

Ideally, if you could provide us with a script that starts from a
totally empty repository and reproduces the situation you're seeing
that would be great.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 9 19:51:08 2006

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.