[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: marc gonzalez-carnicer <carnicer.lists_at_gmail.com>
Date: 2007-02-05 12:39:27 CET

this is well explained in the book, http://svnbook.org,
as janine already pointed out.

please read it, at least the examples of harry and
sally.

i'd say you are using the term "checkout" as if you
were using visual source safe. this term does not
have the same meaning in svn. in svn all the files
are "checked-out" (in the VSS sense) by default.

2007/2/5, Himanshu Raina <raina_himanshu@yahoo.com>:
> HI,
>
> My query is say tow users downloaded the same file.Let's say user A and
> B.Now A updates the file a.sh and commits to the repository.Now when B makes
> changes to a.sh and does commit he gets error about his file being
> out-of-date,now if B wants his changes to be merged with that of A on the
> repository how can that be done.what if i don't want to do an svn update
> because i am assuming that the copy that i have with me is the latest one
> and based on that assumption i have now modified the file.In this scenario
> if i do svn update whole of my work is lost and i need to modify the a.sh
> file again.So is there a method by which i can achieve this and if yes how
> can that be done.I tried svn merge but couldn't get the right syntax.
>
> regards
> Himanshu Raina
>
> ----- Original Message ----
> From: Janine Sisk <janine@furfly.net>
> To: Subversion List <users@subversion.tigris.org>
> Cc: Himanshu Raina <raina_himanshu@yahoo.com>
> Sent: Saturday, February 3, 2007 12:33:57 AM
> Subject: Re: SVN Merge !!
>
> 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
>
>
>
>
>
>
>
>
>
> ____________________________________________________________________________________
> Expecting? Get great news right away with email Auto-Check.
> Try the Yahoo! Mail Beta.
> http://advision.webevents.yahoo.com/mailbeta/newmail_tools.html
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 5 12:39:52 2007

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