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

Check for diff before trying to merge

From: Bráulio Marques Horta <brauliomhorta_at_gmail.com>
Date: Thu, 14 Feb 2008 08:25:53 -0200

Dear subversion users,

I'm using TortoiseSVN 1.4.5 (Subversion 1.4.5)

Yesterday, one of our developers had a problem during commit.
He received that "Cant Remove *transaction file*" error (similar to that i
described before in
http://subversion.tigris.org/servlets/ReadMsg?listName=users&msgNo=71455).

But it is not THE problem now. As he had a successful commit but received an
error, his working copy got in an out-of-date state.
So (like i did before) he made an update. This update behaves like this:

1 - For normal (unchanged) files nothing happens (it is ok!)
2 - For modified text files a merge happens (but files don't change because
repository and working copy files are the same)
3 - For modified binary files a conflict happens (files cant be merged but
they are the same)
4 - For new(added) files he got an error during update. (client complains
that already exists a file with the same name in repository)

We can live with 2, but 3 and 4 are really annoying. We had to manually
solve each error/conflict. In particular, this commit involved a lot of
files and fixing all this mess took me about 1 hour. I know i can make a
script for fixing this but it is not the reason I'm writing this e-mail.

I want to ask if it is possible to force a *more intelligent update*. I mean
an update that checks if files are different(compare) before merging(even
for binary) and that checks if an added file is different from an existing
file in repository before returning a error. If don't, i think it can be a
good feature request!

Thanks!

Bráulio
Received on 2008-02-14 11:26:17 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.