Re: Update deleted local changes after rollback

2010-08-15 Thread Johan Corveleyn
On Thu, Aug 12, 2010 at 5:13 PM, Ulrich Eckhardt wrote: > On Thursday 12 August 2010, erlend olsen wrote: [...] >> B: commits new code. >> A: is happy because now everything works on his local copy. Then he pushes >> 'update' in netbeans before he commits. SVN: now deletes all of A's >> change

Re: Update deleted local changes after rollback

2010-08-12 Thread Ulrich Eckhardt
On Thursday 12 August 2010, erlend olsen wrote: > repository has these files: > xyz > A: commits changes to all the files and adds 2 new files > repository now has these files: > pqxyz > B: Sees that these changes f**ks up the whole program and he rollbacks to > only x,y,z I guess he reverse-merge

RE: Update deleted local changes after rollback

2010-08-12 Thread Giulio Troccoli
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 From: erlend olsen [mailto:eolse...@hotmail.com] Sent: 12 August 2010 13:53 To: users@subvers