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

Re: [TSVN] Re: Merging from deleted branch to trunk

From: Nathan Creek <nathan_at_adweb.com.au>
Date: 2005-01-21 03:19:15 CET

Mark Phippard wrote:
> Finally, one problem with the Revert approach is when merge adds files.
> Revert undoes the Add, but will never delete the file. So, those files
> have to be manually found and deleted so that you can do the merge again.

Good point. I hadn't come across that before. Guess i'll have to keep a
lookout for skipped items in the merge log.

@Stefan: would it be a good idea to have items that Skipped in the merge
come up in some colour other than black so that they're more noticable?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jan 21 03:19:52 2005

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