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

RE: Merging changes

From: Gavin Lambert <gavinl_at_compacsort.com>
Date: 2005-11-11 02:26:17 CET

Quoth Ric@Consultants-Inc.com <mailto:Ric@Consultants-Inc.com>:
> Loaded the repository with the original software.
> A co-worker checked out all the software, I didn't.
> I made changes to my original software, but didn't do a
> checkout from SVN. The co-worker checked in his changes.
> Now I want to get my changes 'merged' into his.
> I checked out the software.
> I moved my 'modified files' into the working directory,
> replacing original files. I did an SVN Update. Nothing happened!
> So my question is: how can I get SVN to merge my changes into the
> version from the repository?
> I hoped that be replacing the files in the working directory with my
> versions, SVN would then merge my changes into the repository
> version. Can I fix this without doing a manual 'diff'?

An 'update' will update your local copy with the changes in the
*repository*. Since you had just done a fresh checkout and nobody else
had changed anything since then, naturally the update didn't do

To update the repository with your changes, you 'commit' them.

Since you've done things in the wrong order (by copying your changes in
from 'outside' subversion), it might be a bit trickier than that,
though. If you're *absolutely* certain that the other developers
haven't changed anything in any of the files you changed, then just
doing a commit will be fine.

But if the other developer has changed the same file you have, then
you'll have to manually merge the changes. (Normally subversion will
detect this condition and warn you about it. But because of the order
you did things in this time, it won't be able to detect the condition.
So be careful.)

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 11 02:28:15 2005

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.