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

Re: SVN Merge !!

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-02-02 12:55:38 CET

On 2/2/07, Himanshu Raina <raina_himanshu@yahoo.com> wrote:
>
> Picture This:-
>
> Repository :- http://myip,com/svn/repos/projectA
>
> Under Project A i have a file test.c
>
> There are two users who have checked out this project.Now User A modifies
> the file test.c and does a commit.In this case user B isn't aware of what
> changes have been made.
>
> 1>Is there a way in which user B can merge his changes alongwith changes
> made by A.
>
> 2>The copy of file that user B has is old and after making changes when he
> does an update will he be prompted saying the file he has is out of date and
> a new copy of the file (test.c) needs to be exported.

Please read the book, http://svnbook.org/ . This is one of the most
basic, core use-cases for Subversion.

1) After A commits, B just runs svn update. If they had changes that
conflict, Subversion flags these and leaves it to the user to resolve.
If they don't have changes that conflict, the A's changes are merged
into B's version.

2) No export needed if you're using Subversion properly. See 1).

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 2 13:17:19 2007

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