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

Re: RCS to Subversion transition (Re: Newbie questions: How to check out just one file, etc.)

From: matthew ford <matthew.ford_at_forward.com.au>
Date: 2005-01-24 01:25:33 CET

See my other email
Re merge not merging (useless result and poor docs)
for details of my problems

Just had a call from the boss. He cannot get merge to work either.
My suggestion to him was to check out the trunk and the branch and use
BeyondCompare to compare and merge from the branch to the trunk.

matthew

----- Original Message -----
From: "Ben Collins-Sussman" <sussman@collab.net>
To: "matthew ford" <matthew.ford@forward.com.au>
Cc: <users@subversion.tigris.org>
Sent: Monday, January 24, 2005 10:57 AM
Subject: Re: RCS to Subversion transition (Re: Newbie questions: How to
check out just one file, etc.)

>
> On Jan 23, 2005, at 5:42 PM, matthew ford wrote:
>
> >
> >> With Subversion, the working model is very different. Everyone
> >> duplicates the entire library (or at least whole departments) to their
> >> local workspace. It's time-consuming, but it's only done exactly
> >> once.
> >> Then everybody works in parallel, constantly editing, committing,
> >> and
> >> updating. There's no locking, and there's no 'grabbing and putting
> >> back'... everybody has a copy of everything, all the time.
> >
> > This depends on a merge system that works. At present I have not had
> > much
> > sucess with subversion merge
> > I have previously used CVS merge and it works just great, no stuffing
> > about
> > with revision numbers.
> >
>
> Would you like to be more specific? As far as I know, Subversion's
> merging ability is a superset's of CVS. Neither system can track
> repeated merges or has various "smart" merging features. But there's
> no merge CVS can do that Subversion can't. And most of the time,
> Subversion makes it easier.
>
> (I've gotten spoiled, in fact. It kills me whenever I need to merge a
> change in CVS. I find it really irritating. :-) )
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 24 01:28:19 2005

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