RE: just upgraded to svn 1.5 - confused
> On Thu, Apr 28, 2011 at 20:27, Totte Karlsson > wrote: > > Someone said that merges are easy.. I have read the svn book > about merges > > but it does not help. > > > > I create a branch and I can keep it synchronized with the trunk. > > I can even re-integrate the branch with the trunk. > > > > From now on, it seems the branch is useless since I can't > continue working > > on it and re-sync with the trunk without getting absolutely > nonsense > > conflicts.. :) > > > > What is the proper, if any, philosophy here? Shall one create a > new branch > > each time it is re integrated with the trunk? > > If you want to keep the branch alive, don't use --reintegrate. > > From the fine manual: > > "In Subversion 1.5, once a --reintegrate merge is done from branch > to > trunk, the branch is no longer usable for further work. It's not > able > to correctly absorb new trunk changes, nor can it be properly > reintegrated to trunk again. For this reason, if you want to keep > working on your feature branch, we recommend destroying it and then > re-creating it from the trunk" > > You will want to read > http://svnbook.red- > bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.a > dvanced.reintegratetwice > if you plan on using --reintegrate while keeping the branch around. Ff after you re-integrate you merge that rev from trunk with --record-only you can keep using the same branch. But, yes for the most part, "reintegrate" is designed for feature branches which are generally not used/needed after the feature is reintegrated into trunk. BOb
Re: just upgraded to svn 1.5 - confused
Ff after you re-integrate you merge that rev from trunk with --record-only you can keep using the same branch. But, yes for the most part, "reintegrate" is designed for feature branches which are generally not used/needed after the feature is reintegrated into trunk. I am sometimes using tortoise svn and I found a peculiar thing! If I select their reintegrate branch option, both ways it seems to work to sync branch back to trunk over and over again. By both ways I mean that when syncing the branch with trunk changes, I use the re integrate option and selects the trunk, and vice versa.. Is it supposed to work like that? Confusing or what! Thanks, Totte
Re: Windows SSL Error
2011/4/26 Platz, Steve : > Our Entrust SSL certificate recently expired and was replaced with a new one > utilizing a certificate chain. Since installing the new certificate, access > to a front-end website using this same certificate has been unaffected. > However, we’re now seeing issues when we attempt to check > out/update/browse/etc the repository using Windows (XP/7). In Windows, using > version 1.6.16, I’m getting the following error: > > > > C:\Users\steve_platz>svn info https://path/to/repository > > Error validating server certificate for 'https://path/to/repository:443': > > - The certificate is not issued by a trusted authority. Use the fingerprint > to validate the certificate manually! > I think that it uses OS libraries to check the certificates. When you go to the Microsoft's Windows update site, among the "not important" updates there exists the "update root certificates" update. Maybe it will help you. Quick googling leads to this page: http://support.microsoft.com/kb/931125/en-us Best regards, Konstantin Kolinko
Re: Merging two projects in two different repos
Svnsync does not allow the project/sub-directory in this case to be updated in the future, according to what I read. Is this information incorrect? I have never used svnsync before. TIA, On Apr 28, 2011, at 8:58 AM, Daniel Shahaf wrote: > Ulrich Eckhardt wrote on Thu, Apr 28, 2011 at 12:27:07 +0200: >> On Thursday 28 April 2011, List Man wrote: >>> I want to take one project from one repo and put it in a directory under >>> another repo. Is it possible to keep the history of said project? >> >> No, not through the client interface, which is what you use for everyday >> work. >> > > *cough* svnsync? > >> If you have direct access to the repository, you could use e.g. the >> dumpfilter >> tool to change history retrospectively. >> >> >> Cheers! >> >> Uli >> >> >> -- >> ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html >> FAQ: http://subversion.apache.org/faq.html >> Docs: http://svnbook.red-bean.com/ >> >> ** >> Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland >> Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932 >> ** >> Visit our website at http://www.dominolaser.com >> ** >> Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten >> bestimmt und kann vertrauliche Informationen enthalten. Bitte >> benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte >> Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf >> weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt >> werden. >> E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte >> Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht >> verantwortlich. >> ** >>
Re: Merging two projects in two different repos
No, but if you don't have file access to the source repository you can use svnsync to copy it to a location where you do have access. Then you can svnadmin dump/filter and load to your desired project location. The dump/filter/load is a one-time process and has the problems of making your date ranges non-contiguous and changing the revision numbers of the imported content that have already been mentioned. But, it does let you put the project where you want and keep the (renumbered) history of changes. On 4/29/2011 5:19 PM, List Man wrote: Svnsync does not allow the project/sub-directory in this case to be updated in the future, according to what I read. Is this information incorrect? I have never used svnsync before. TIA, On Apr 28, 2011, at 8:58 AM, Daniel Shahaf wrote: Ulrich Eckhardt wrote on Thu, Apr 28, 2011 at 12:27:07 +0200: On Thursday 28 April 2011, List Man wrote: I want to take one project from one repo and put it in a directory under another repo. Is it possible to keep the history of said project? No, not through the client interface, which is what you use for everyday work. *cough* svnsync? If you have direct access to the repository, you could use e.g. the dumpfilter tool to change history retrospectively. Cheers! Uli
