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

RE: Bug/Inconsistency in merging single files

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-10-02 16:15:15 CEST

> -----Original Message-----
> From: Lakshman Srilakshmanan
> [mailto:lakshman.srilakshmanan@tradingpost.com.au]
> Sent: Sunday, October 01, 2006 8:48 PM
> To: Reedick, Andrew
> Cc: users@subversion.tigris.org
> Subject: RE: Bug/Inconsistency in merging single files

> For __single file merges__ to succeed when adding a new file,
> we need to
> merge at directory level. I also understand that it needs to
> be done at
> the directory level because the directory controls need to be updated
> etc. etc.
> My question is, shouldn't the directory controls be updated when it
> detects an "Add" during single file merges (the directory already
> exists) just as the directory control gets updated during a
> single file
> merge of an existing file.

        It would be nice if it did. I can't think of a situation where
doing an implicit directory merge of a single file would cause harm.
Well, maybe one. If you had deleted foo.java from trunk, you might not
want it implicitly re-merged in, without some kind of confirmation (such
as a --force-dir-merge option.) Then again, if you're merging by single
file names, you should already be aware of what files exist or don't
exist between the branch and the trunk.
        Judging by how directory centric Subversion is (ex: you can
only checkout by directory and not by single files) it might not be
practical to implement automatic dir merges for single file merges.


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA624

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 2 16:17:25 2006

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

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