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

question about merging..

From: Joseph Silverman <yossie_at_laszlosystems.com>
Date: 2005-01-21 19:22:26 CET

I would like to do a merge from B to A where A is a working copy and B
is a repository copy. B would be whatever is in the working directory
while A is the last version committed.

I would like the merge to be unconditional - as in if there are
conflicts - ignore them and use whatever is in B. B might be the same
as the repository (committed) version, or not.

B will almost certainly have been 'copy'ed from A at some point in the
past, this copy from A to B and merge back to A might have taken place
a number of times.

There may also be situations where A is copied to B and to C (at
different times). Subsequently B might be merged to C, which would
then be merged back to A.

I will likely be performing a large number of these in the same commit.
  So they all have to take place in the working copy till I do that.

What svn command(s) will do this?

THANKS - Yossie

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 21 19:27:21 2005

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