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

Re: Adding a new file to a patch work flow problem

From: Mike Mason <mgm_at_thoughtworks.net>
Date: 2003-12-19 16:05:29 CET

Barry Scott wrote:

>
> My expectation was that svn up would see that the file is added in the
> wc and update wants to add so they match semantically. Then it would
> just do the merge/conflict stuff as happens to versioned files.

Whilst I agree it would be great for Subversion to detect this and do
something useful, I don't know of a single other version control system
that will handle this gracefully (answers on a postcard please!).
Perforce would say conflict, CVS would say "move your file, it's in the
way!", StarTeam would report "unknown" (very helpful that one). I admit
I don't know much about fancy things like arch, BitKeeper and svk.

Even if it did handle it, you'd probably want to know that someone else
added the file you wanted to add, with identical contents. Then you
might want to go talk to that person about how you two can communicate
better in future! ;-)

Cheers,
Mike.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Dec 19 16:05:56 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.