Re: Subversion merge minified javascipt shows conflict

2014-02-02 Thread Thorsten Schöning
Guten Tag Kamal Ahmed, am Samstag, 1. Februar 2014 um 09:46 schrieben Sie: > When I do a diff $REPO1/file $REPO2/file, svn diff $REPO1/file > $REPO2/file or do the same diff operation with the minified version > of the same file, I get no differences. Sounds like you are comparing both files @HEA

Subversion merge minified javascipt shows conflict

2014-02-02 Thread Kamal Ahmed
When I do a diff $REPO1/file $REPO2/file, svn diff $REPO1/file $REPO2/file or do the same diff operation with the minified version of the same file, I get no differences. But, when I do an svn merge $REPO2, while in the $REPO1 fresh checked out directory, I get an svn conflict. Does subversi

Re: expanding custom keywords in dump

2014-02-02 Thread Nico Kadel-Garcia
Branko, have I ever mentioned how nice it is to see employees of the companies producing the core source code doing thoughtful posts? It's one of the main reasons I've appreciated Subversion over the years. On Sun, Feb 2, 2014 at 1:41 AM, Branko Čibej wrote: > On 02.02.2014 04:14, Nico Kadel-Garc

RE: Possible bug in SVN 1.8.3 and 1.8.4 - file locking

2014-02-02 Thread Bert Huijben
> -Original Message- > From: Ben Reser [mailto:b...@reser.org] > Sent: zaterdag 1 februari 2014 02:39 > To: Steve Davis; users@subversion.apache.org > Subject: Re: Possible bug in SVN 1.8.3 and 1.8.4 - file locking > > On 1/31/14, 1:54 PM, Steve Davis wrote: > > :: Attempted to lock the