Is it normal to have the source folder of a merge from one branch to another to be emptied? At work we use perforce (previously we used CVS) and we routinely merge code from branch to branch with the intention of keeping the code in both branches - e.g. a branch may need code from another branch where development is ongoing so losing the code there would be bad. Just curious what the intent was here in the case of the SDR-X -> main merge.
Pete, n3evl ----- Original Message ----- From: "Bill Tracey" <[EMAIL PROTECTED]> To: <[EMAIL PROTECTED]>; "'Stig Rasmussen'" <[EMAIL PROTECTED]>; <flexradio@flex-radio.biz> Sent: Thursday, July 05, 2007 9:39 AM Subject: Re: [Flexradio] USB problem with SVN1307? > Hello Alex, > > The SDR-X branch got merged into the main line after I posted - that > is why the folders are now showing as empty. > > The files can be found in the main branch @: > svn://206.216.146.154/svn/repos_sdr_windows/PowerSDR/trunk/Source/libusb/bin > > Regards, > > Bill (kd5tfd) > > At 05:31 AM 7/5/2007, ON9CDY wrote: >>Bill, >> >>All folders are empty on >>svn://206.216.146.154/svn/repos_sdr_windows/PowerSDR/branches/SDR-X/Source/l >>ibusb/bin . >> >>Where can we get the new libusb0.sys and libusb-flex-hpsdr.inf files? I >>got >>the libusb0.dll via automatic SVN update, so that is no problem. >> >>73, Alex OP8Y >> >><...snip...> > > > > _______________________________________________ > FlexRadio mailing list > FlexRadio@flex-radio.biz > http://mail.flex-radio.biz/mailman/listinfo/flexradio_flex-radio.biz > Archive Link: http://www.mail-archive.com/flexradio%40flex-radio.biz/ > FlexRadio Knowledge Base: http://kb.flex-radio.com/ > FlexRadio Homepage: http://www.flex-radio.com/ > _______________________________________________ FlexRadio mailing list FlexRadio@flex-radio.biz http://mail.flex-radio.biz/mailman/listinfo/flexradio_flex-radio.biz Archive Link: http://www.mail-archive.com/flexradio%40flex-radio.biz/ FlexRadio Knowledge Base: http://kb.flex-radio.com/ FlexRadio Homepage: http://www.flex-radio.com/
