Re: Relative Revision on Relative Path External

2012-12-12 Thread Stefan Sperling
On Wed, Dec 12, 2012 at 02:13:01PM -0500, Stefan Scherer wrote: > The idea being that we simply move the peg revision on a plugin in order to > include the latest QA approved plugin in a release candidate build. > After QA approved the candidate we simply tag the staging branch as a > release. > >

Re: Relative Revision on Relative Path External

2012-12-12 Thread Stefan Scherer
Hello again, I just noticed my previous email got somewhat scrambled. The idea was to have notation like the following ../../common/module1@RELATIVE module1 in order to peg an external to the revision of the folder owning the the external property. The reason why I would like such a feature is

Re: Merge of rename only merged deletion, not addition - file lost

2012-12-12 Thread Johan Corveleyn
On Wed, Dec 12, 2012 at 4:33 PM, Asbjørn Sæbø wrote: > > > Dear TortoiseSVNers, > > We have just seen a case where a file has been lost as a combination > of renaming and merging. We must understand how this could happen, so > that we can avoid similar situations in the future. First important q

Merge of rename only merged deletion, not addition - file lost

2012-12-12 Thread Asbjørn Sæbø
Dear TortoiseSVNers, We have just seen a case where a file has been lost as a combination of renaming and merging.  We must understand how this could happen, so that we can avoid similar situations in the future. What happened: 1 Our "product branch" (think of it as our trunk) was branched, to

Re: Subversion Exception!

2012-12-12 Thread Philip Martin
Ravi Kalyan Chakravarthy writes: > In file > 'D:\Development\SVN\Releases\TortoiseSVN-1.7.10\ext\subversion\subversion\libsvn_wc\update_editor.c' > line 1583: assertion failed (action == svn_wc_conflict_action_edit || action > == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_r

Subversion Exception!

2012-12-12 Thread Ravi Kalyan Chakravarthy
--- Subversion Exception! --- Subversion encountered a serious problem. Please take the time to report this on the Subversion mailing list with as much information as possible about what you were trying to do. But please first search the mailing list