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

Forcing a commit of an updated, out of date file.

From: Alan Knowles <alan_at_akbkhome.com>
Date: 2005-07-16 16:01:56 CEST

Not sure if this is solvable in any cleaner way. but since I could not
find an answer in the manual/ google I thought I'd see if anyone had
better ideas.

Scenario:
Dev server with Copy of code (web site app etc.)
Live server with copy of code.

We have checked out the current head into both places..
Client sends email saying can you make this change.. (which is done on
dev server)
Meanwhile client makes another change to the live checked out version.
(something fun like changing all the line breaks ;)

I make the changes to the dev server, check in the changes - then go to
the live server and realize that the working copy has been modified
there...
- since I dont really want to break the live server, I dont want to do a
update, as it will end up with <<<< merge tags everywhere..

Ideally I want to commit the clients changes and override my own changes
(which are easier to reproduce..)..
But commiting the files always gives 'working copy up to date'

----------------
Workaround:
I ended up copying the changed file to the dev server, and committing it
from there, then doing a svn up on the live server..

but It would have been easier to using a commit --force or something...
- Have I missed something in the docs? or is there a better way to do
this.?

Regards
Alan

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 16 15:59:13 2005

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