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

RE: feature request: commit warning for switched subtrees

From: Todd C. Gleason <tgleason_at_impac.com>
Date: Wed, 21 Oct 2009 07:43:57 -0700

> -----Original Message-----
> From: Jean-Marc van Leerdam [mailto:j.m.van.leerdam_at_gmail.com]
> Sent: Tuesday, October 20, 2009 11:33 PM
> To: users_at_tortoisesvn.tigris.org
> Subject: Re: feature request: commit warning for switched subtrees
> Hi Todd,
> 2009/10/21 Todd C. Gleason <tgleason_at_impac.com>:
> > I just tried this using TSVN 1.6.5, and it was as I said:  TortoiseSVN
> offered to commit all the files from both locations.
> >
> > In more detail:
> >
> > 1.  I edited within folder 1 in my branch WC
> > 2.  I edited within folder 2 in my trunk WC
> > 3.  I copied folder 1 from my branch WC into my trunk WC, overwriting
> the contents of the trunk WC's folder 1 (including .svn dirs).
> > 4.  I selected Svn Commit...
> > 5.  Both the files in folder 1 (copied from the branch) and folder 2
> (always the trunk) displayed in the commit dialog.
> > 6.  I verified that the Svn path of the copied folder 1 is still the
> branch, while folder 2 is the trunk, as is the parent of folders 1 and 2.
> Sure, this is expected. A nested layout with parts coming from one and
> the same repository can be committed in one go. That's intended and
> frequently preferred behavior (even if it's not always expected by the
> user).
> I can see why in some situations it would be beneficial to inform
> users about the fact that the commit about to take place spans one or
> more nested folders. That information is available to the user if
> he/she carefully examines the 'path' column, but given any reasonably
> sized WC and/or repository the different paths may be hard to catch at
> a glance.

Right, I agree that this is "expected" given how the WC folders work (at least until Svn 1.7 with wc-ng). There is no bug here, it's just occasionally problematic as I have had to advise or repair this sort of problem made by other users on a couple occasions, and for all I know, it has occurred a lot more than that and gone unnoticed.

Now, my mention of 1.7 may be relevant: the copy/overwrite case I described may become a non-issue with wc-ng, because without the .svn folders, the behavior above would not result in nesting/switching. And then, the proposed warning might seem to have very short-term utility. However, even if you did an explicit switch on a subtree, rather than a copy/overwrite, I think the warning would be nice to have.

BTW, I believe it's the URL column, not the path column, that you would have to examine, and it is turned off by default, which means few users will ever see that column, let alone pay enough attention to notice this sort of problem.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-21 16:50:09 CEST

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