SVN Merge !!

[Himanshu Raina <ra...@yahoo.com>]

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.

Thanks and Regards
himanshu raina




 
____________________________________________________________________________________
8:00? 8:25? 8:40? Find a flick in no time 
with the Yahoo! Search movie showtime shortcut.
http://tools.search.yahoo.com/shortcuts/#news

Re: SVN Merge !!

[Janine Sisk <ja...@furfly.net>]

On Feb 2, 2007, at 3:55 AM, Andy Levy wrote:

> 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.

And if B tries to commit without doing the update, because he doesn't  
know about A's change, svn will stop the commit and tell him that the  
file is not up to date.  So he will be told that he needs to do it.

janine

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: SVN Merge !!

[Andy Levy <an...@gmail.com>]

On 2/2/07, Himanshu Raina <ra...@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