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

Re: merging problem when not trying to merge

From: Garret Wilson <garret_at_globalmentor.com>
Date: 2003-03-28 22:20:31 CET

Oh, one other thing:

While doing some work with file2 in /repos/test/, I repeatedly modified
file2 and then would bring back the old file2 using "svn revert file2".
I was still at the DOS prompt at /repos/test/ when I tried to commit via
TortoiseSVN.

Is it possible "svn revert" could somehow have left some sort of file
lock on the Subversion data, so that the commit couldn't be updated locally?

Garret

Ben Collins-Sussman wrote:
> Garret Wilson <garret@globalmentor.com> writes:
>>Just what I expected. file1 and file2 had been added by TortoiseSVN as
>>expected, but they hadn't been properly committed. I tried "svn status
>>-u":
>>
>> * 1 example
>>A * 0 example/Contacts
>>A * 0 example/Contacts/file1
>>A * 0 example/Contacts/file2
>>M * 2 test/file2
>>Head revision: 3
>
>
> Hm, it looks to me like the commit *did* happen on the server, but
> that your working copy wasn't processed afterwords. It still has
> local changes scheduled for commit.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 28 22:21:52 2003

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

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