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

Re: Update problem: Tree conflicts vs content conflicts

From: Steve Williams <stevewilliams_at_kromestudios.com>
Date: 2005-09-08 02:38:28 CEST

Joshua Varner wrote:
> I agree it's easy for a warning like that to fly past. Why not put it
> in a state of
> conflict and if it is a tree conflict use the filenames to indicate
> the conflict state.
>
> For example if I had deleted a file in my wc and updated to get a new version.
> I would have:
> <file> - Not there since that is the proposed resolution
> file.mine-deleted - tag indicates the tree change (empty file)
> file.r102 - prev rev
> file.r103 - new rev
>
> and so forth.
>
> If you wanted it to stay deleted, then you just svn resolve the file.
> Any thoughts?

That wouldn't work in GUI clients like TortoiseSVN where you click on
the file and select "TortoiseSVN > Resolve..." because the versioned
file would not be there to click on.

-- 
Sly
This message and its attachments may contain legally privileged or confidential information. This message is intended for the use of the individual or entity to which it is addressed. If you are not the addressee indicated in this message, or the employee or agent responsible for delivering the message to the intended recipient, you may not copy or deliver this message or its attachments to anyone. Rather, you should permanently delete this message and its attachments and kindly notify the sender by reply e-mail. Any content of this message and its attachments, which does not relate to the official business of the sending company must be taken not to have been sent or endorsed by the sending company or any of its related entities. No warranty is made that the e-mail or attachment(s) are free from computer virus or other defect.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 8 02:39:10 2005

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