2013/4/29 Florian Jung <[email protected]>: > Am 29.04.2013 03:19, schrieb Tim E. Real: > >> But as I posted earlier I'm a bit frustrated that I must now supply a >> password *every* time I want to download or update my local copy >> of the new repo - even *every* time I simply open the repo in KdeSvn >> simply to examine it ! >> Seems that something still may not be right, I've set up my SSH and so on, >> and it still asks for a password when I just want to examine the repo >> in KdeSvn. > > does it ask if you use svn commit from the command line? if yes, then > you did something wrong. > > Does it ask you for your sf.net password, or for the ssh-key passphrase? > >> >> So I'm kind of worried what's going to happen when I finally complete >> my (long awaited months-long) current work and sit down and try to >> merge - both to and from the new repo. >> >> Robert seems to have had no trouble at all committing new stuff, >> although that's not the same as what you and I are faced with - >> his was fresh new stuff I think, but we both have back-logged material >> that needs to be merged - both to and from the new repo. > > did he merge stuff, or just commit into trunk? (Committing to trunk > works without issues. If someone knows how to merge, tell me!)
Man, that sucks! :( Unfortunately I haven't tried merging either. > >> >> Yikes... Sweating and nail-biting in apprehension of impending disaster...? > > it's not THAT bad. read > > svn help diff > > and > > man patch > > (especially the --merge option) > > you can do manual merging by svn diff-ing trunk from revision foo to > HEAD, and then applying this patch using patch --merge to your branch. > > HOWEVER, this will break svn merging even more. > > i'll need to contact sf.net :/ Sounds like a good idea before trying the worse scenario atleast. Regards, Robert > > greetings, > flo > ------------------------------------------------------------------------------ Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET Get 100% visibility into your production application - at no cost. Code-level diagnostics for performance bottlenecks with <2% overhead Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap1 _______________________________________________ Lmuse-developer mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lmuse-developer
