Andreas Krey wrote on Tue, Oct 18, 2011 at 06:04:12 +0200:
> #!/bin/sh
alias svn=$svn svnadmin=$svnadmin
> rm -rf svntmp
> mkdir svntmp
> cd svntmp
> svnadmin create repo
> svn checkout file://`pwd`/repo wc
> cd wc
> cp ../../kadr.polon.p .
> svn add kadr.polon.p
> svn commit -m 1
> cat >>kadr.p
Andreas Krey wrote on Wed, Oct 19, 2011 at 12:00:27 +0200:
> On Wed, 19 Oct 2011 11:37:25 +, Daniel Shahaf wrote:
> ...
> > Adam, Andreas: when you say what passes/fails for you, please also
> > mentino the environment. I've so far tested on 32bit Linux and I plan
> > to test in a couple more
I've tested in Windows 7
Command line svn from VisualSVN version 2.5.0
GUI via TortoiseSVN 1.7 RC1,TortoiseSVN 1.7, TortoiseSVN 1.7
Nightbuild 22093 and TortoiseSVN 1.7 Nightbuild 22114
And SLES 10.2 x86 32bit
Subversion 1.7 builded from tar.
in all cases diff looks that same.
Adam Miazga
2011/1
On Wed, 19 Oct 2011 11:37:25 +, Daniel Shahaf wrote:
...
> Adam, Andreas: when you say what passes/fails for you, please also
> mentino the environment. I've so far tested on 32bit Linux and I plan
> to test in a couple more environments once I rebuild trunk on them.
Do you build your test su
Adam Miazga wrote on Wed, Oct 19, 2011 at 10:17:56 +0200:
> Hi
>
> Daniel try this way
>
> 1. download file from first message
> 2. commit this file without modification
> 3. add new line via
> echo "test" >>kadr.polon.p
> 4. commit changed file
> 5.generate diff
>
Thanks for the recipe, howeve
Hi
Daniel try this way
1. download file from first message
2. commit this file without modification
3. add new line via
echo "test" >>kadr.polon.p
4. commit changed file
5.generate diff
I tried to repeat this situation with another file. All my attempts have failed.
This file have corrupted line
On Tue, 18 Oct 2011 17:54:41 +, Daniel Shahaf wrote:
...
> svnmucc, and then append two lines and diff before/after committing,
> but still couldn't reproduce your issue.
I can't reproduce it on the linux box, either. At least not exactly.
This is going to be fun.
My apple produces (without a
On Tue, 18 Oct 2011 17:54:41 +, Daniel Shahaf wrote:
> I tried adding your file with svn:eol-style=native and forcing the
> backend to have non-normalized EOLs (despite the property) by using
> svnmucc, and then append two lines and diff before/after committing,
> but still couldn't reproduce y
I tried adding your file with svn:eol-style=native and forcing the
backend to have non-normalized EOLs (despite the property) by using
svnmucc, and then append two lines and diff before/after committing,
but still couldn't reproduce your issue.
Adam Miazga wrote on Tue, Oct 18, 2011 at 14:33:44 +0
Hi.
I resolv my problem.
When I set "*.p = svn:eol-style=native" in config file then svn ses
svn: E29: File '..\kadr.polon.p' has inconsistent newlines
svn: E135000: Inconsistent line ending style
I'm convert line ending in my file and work fine.
in subversion 1.6 the problem does not exist
Andreas Krey wrote on Tue, Oct 18, 2011 at 10:37:36 +0200:
> On Tue, 18 Oct 2011 10:22:33 +, Daniel Shahaf wrote:
> ...
> > > Replacing each char by another one (individually, not caesar).
> > > But stays, though no duplicate lines:
> > >
> >
> > Huh? This transformation doesn't deduplicate,
On Tue, 18 Oct 2011 10:32:36 +, Daniel Shahaf wrote:
>
> Thanks for the self-contained recipe!
Is the only sane way to do such stuff.
> Using it I cannot reproduce the bug using either 1.6.12, 1.7.0, or
> trunk. I'm on a 32-bit Linux system, using apr/apr-util as shipped with
> httpd 2
On Tue, 18 Oct 2011 10:22:33 +, Daniel Shahaf wrote:
...
> 371 != 450+3, so there are some duplicate lines.
Yes. I forgot to say "it's source code, so of course there are dups". :-)
...
> > Replacing each char by another one (individually, not caesar).
> > But stays, though no duplicate lines
Andreas Krey wrote on Tue, Oct 18, 2011 at 06:04:12 +0200:
> On Mon, 17 Oct 2011 14:21:02 +, Adam Miazga wrote:
> > Hi.
> >
> > I have one "magick" file (in attachment).
> > I commit this file to repository. I add line
> > "/**/"
> > into end of file. And again I commit the file to repository.
Andreas Krey wrote on Tue, Oct 18, 2011 at 10:05:39 +0200:
> On Tue, 18 Oct 2011 08:55:44 +, Daniel Shahaf wrote:
> > >
> > > as the diff.
> > >
> > > But happens only with this specific file; can't reproduce with
> > > other content.
> > >
> >
> > Does the file (either before or after the
On Tue, 18 Oct 2011 08:55:44 +, Daniel Shahaf wrote:
> >
> > as the diff.
> >
> > But happens only with this specific file; can't reproduce with
> > other content.
> >
>
> Does the file (either before or after the append) contain two identical
> lines? If so, could you try replacing each l
Daniel Shahaf wrote on Tue, Oct 18, 2011 at 08:55:44 +0200:
> % perl -lne 'print $h{$_} ||= $unique++' \
Small bug: the last expression should be '++$unique'. (I actually
caught that before posting, but copy-pasted the wrong version.)
Andreas Krey wrote on Tue, Oct 18, 2011 at 06:04:12 +0200:
> On Mon, 17 Oct 2011 14:21:02 +, Adam Miazga wrote:
> > Hi.
> >
> > I have one "magick" file (in attachment).
> > I commit this file to repository. I add line
> > "/**/"
> > into end of file. And again I commit the file to repository.
On Mon, 17 Oct 2011 14:21:02 +, Adam Miazga wrote:
> Hi.
>
> I have one "magick" file (in attachment).
> I commit this file to repository. I add line
> "/**/"
> into end of file. And again I commit the file to repository.
>
> When i invoke "svn diff -r n:m kadr.polon.p" i recive
>
> in Subve
Hi.
I have one "magick" file (in attachment).
I commit this file to repository. I add line
"/**/"
into end of file. And again I commit the file to repository.
When i invoke "svn diff -r n:m kadr.polon.p" i recive
in Subversion 1.6
Index: kadr.polon.p
=
t: Re: Problem with diff after merging
Doesn't 'svn diff' say something to the effect of "A file with
name was added"?
There is also:
% $svn h diff | grep add
--show-copies-as-adds [--sca] : don't diff copied or moved files with
their source
... but I think it
Doesn't 'svn diff' say something to the effect of "A file with
name was added"?
There is also:
% $svn h diff | grep add
--show-copies-as-adds [--sca] : don't diff copied or moved files with their
source
... but I think it's only in 1.7.
Jahn Otto Andersen wrote on Mon, Nov 15, 2010 at 10:2
I am using a code review tool called ReviewBoard to do code reviews. This
tool uses svn diff to report the changes between BASE and work area.
I'm having problems when working in a branch and then merging into trunk.
This problem seems to be caused by the diff generated by svn diff.
What I
23 matches
Mail list logo
