Daniel Berlin wrote:
Uh, but a diff against the pristine copy is the same as a diff against
mainline at that point, since your only differences come from merging
the mainline.
No, the pristine copy is the pristine copy of the branch. I want to diff
my working copy of the branch against t
On Fri, 2005-11-04 at 15:05 +, Joern RENNECKE wrote:
> Daniel Berlin wrote:
>
> >
> >
> >I did
> >
> >svn co svn+ssh://gcc.gnu.org/svn/gcc/branches/sh-elf-4_1-branch
> >cd sh-elf-4_1-branch
> >svn merge -r106276:106279 svn+ssh://gcc.gnu.org/svn/gcc/trunk .
> >(rev 106276:106279 contains the
Daniel Berlin wrote:
I did
svn co svn+ssh://gcc.gnu.org/svn/gcc/branches/sh-elf-4_1-branch
cd sh-elf-4_1-branch
svn merge -r106276:106279 svn+ssh://gcc.gnu.org/svn/gcc/trunk .
(rev 106276:106279 contains the change that will remove .cvsignore)
[EMAIL PROTECTED]:/mnt/gccstuff/sh-elf-4_1-bran
Phil Edwards wrote:
> On Fri, Nov 04, 2005 at 12:58:11AM +0100, Giovanni Bajo wrote:
>> Joern RENNECKE <[EMAIL PROTECTED]> wrote:
>>
>>> P.S.: When I use a diff-cmd with -N, I not only get a diff for the 44
>>> files that are different, but also a header for each of the 752 files
>>> that are iden
On Thu, 2005-11-03 at 20:29 -0500, Joern Rennecke wrote:
> > What version of svn?
>
> The 1.3 release candidate.
>
> > What is the exact branch you are trying to diff??
>
> I had checked out a copy of the sh-elf-4_1-branch, and used
> svn merge to apply the patches from the last merge point to
>
> What version of svn?
The 1.3 release candidate.
> What is the exact branch you are trying to diff??
I had checked out a copy of the sh-elf-4_1-branch, and used
svn merge to apply the patches from the last merge point to
the current mainline. This merge deleted the .cvsignore file
in my workin
>> cvs would never do such nonsense.
>Absolutely! It would just print all the directory names in the middle of the
>diffs. I call that nonsense as well.
But the directory names go to stderr. When you redirect stdout to a file,
a diff without the directory names is written to that file, while yo
On Thu, 2005-11-03 at 19:13 -0500, Daniel Berlin wrote:
> On Thu, 2005-11-03 at 12:03 -0800, Mike Stump wrote:
> > On Nov 3, 2005, at 11:15 AM, Joern RENNECKE wrote:
> > > bash-2.05b$ svn diff --old svn+ssh://[EMAIL PROTECTED]/svn/gcc/
> > > trunk/gcc --new gcc
> >
> > > /usr/bin/diff -up -F'^('
On Thu, 2005-11-03 at 20:18 +, Joern RENNECKE wrote:
> Daniel Jacobowitz wrote:
>
> >
> >
> >Whatever you want. It should probably either return success, or use -N.
> >
> >
> I also get a failure when I comment out the diff-cmd line in my
> ~/.subversion/config .
> Does that mean that ev
On Thu, 2005-11-03 at 12:03 -0800, Mike Stump wrote:
> On Nov 3, 2005, at 11:15 AM, Joern RENNECKE wrote:
> > bash-2.05b$ svn diff --old svn+ssh://[EMAIL PROTECTED]/svn/gcc/
> > trunk/gcc --new gcc
>
> > /usr/bin/diff -up -F'^(' -u -L gcc/.cvsignore (.../svn+ssh://
> > [EMAIL PROTECTED]/svn/gc
On Thu, 2005-11-03 at 20:36 +, Joern RENNECKE wrote:
> Daniel Jacobowitz wrote:
>
> >
> >
> >Whatever you want. It should probably either return success, or use -N.
> >
> >
> >
> P.S.: When I use a diff-cmd with -N, I not only get a diff for the 44
> files that are different,
Don't use
On Fri, Nov 04, 2005 at 12:58:11AM +0100, Giovanni Bajo wrote:
> Joern RENNECKE <[EMAIL PROTECTED]> wrote:
>
> > P.S.: When I use a diff-cmd with -N, I not only get a diff for the 44
> > files that are different,
> > but also a header for each of the 752 files that are identical, i.e.
> > two line
Joern RENNECKE <[EMAIL PROTECTED]> wrote:
> P.S.: When I use a diff-cmd with -N, I not only get a diff for the 44
> files that are different,
> but also a header for each of the 752 files that are identical, i.e.
> two lines for each file like:
>
> Index: gcc/tree-ssa-operands.c
>
Daniel Jacobowitz wrote:
Whatever you want. It should probably either return success, or use -N.
P.S.: When I use a diff-cmd with -N, I not only get a diff for the 44
files that are different,
but also a header for each of the 752 files that are identical, i.e. two
lines for each file
Daniel Jacobowitz wrote:
Whatever you want. It should probably either return success, or use -N.
I also get a failure when I comment out the diff-cmd line in my
~/.subversion/config .
Does that mean that every subversion configuration that doesn't
configure a diff-cmd to deal
with non-
On Thu, Nov 03, 2005 at 08:08:27PM +, Joern RENNECKE wrote:
> Daniel Jacobowitz wrote:
>
> >On Thu, Nov 03, 2005 at 07:15:22PM +, Joern RENNECKE wrote:
> >
> >
> >>Index: gcc/.cvsignore
> >>===
> >>/usr/bin/diff -up -F'^(' -u
Daniel Jacobowitz wrote:
On Thu, Nov 03, 2005 at 07:15:22PM +, Joern RENNECKE wrote:
Index: gcc/.cvsignore
===
/usr/bin/diff -up -F'^(' -u -L gcc/.cvsignore
(.../svn+ssh://[EMAIL PROTECTED]/svn/gcc/trunk/gcc) (revision
On Thu, Nov 03, 2005 at 07:15:22PM +, Joern RENNECKE wrote:
> Index: gcc/.cvsignore
> ===
> /usr/bin/diff -up -F'^(' -u -L gcc/.cvsignore
> (.../svn+ssh://[EMAIL PROTECTED]/svn/gcc/trunk/gcc) (revision 0) -L
> gcc/.cvsignore
On Nov 3, 2005, at 11:15 AM, Joern RENNECKE wrote:
bash-2.05b$ svn diff --old svn+ssh://[EMAIL PROTECTED]/svn/gcc/
trunk/gcc --new gcc
/usr/bin/diff -up -F'^(' -u -L gcc/.cvsignore (.../svn+ssh://
[EMAIL PROTECTED]/svn/gcc/trunk/gcc) (revision 0) -L
gcc/.cvsignore (.../gcc) (revis
19 matches
Mail list logo
