[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: rev 4391 - [...]

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-01-15 01:30:24 CET

Karl Fogel <kfogel@newton.ch.collab.net> writes:

> rassilon@tigris.org writes:
> > Author: rassilon
> > Date: 2003-01-14 17:35:39 -0600 (Tue, 14 Jan 2003)
> > New Revision: 4391
> >
> > Added:
> > branches/issue-1003-dev/packages/win32-innosetup/svn.url
> > branches/issue-1003-dev/packages/win32-innosetup/svn_isx.pas
> > [...]
>
> Bill, any reason you don't make your changes in the one subdirectory
> of the branch (libsvn_fs), and keep that directory `switch'ed in your
> working copy? That way you're always on trunk except for your
> changes, and people on slow links don't have to deal with huge merge
> mails every now and then.

Although this merge should not have been that big. Try

svn diff http://svn.collab.net/repos/svn/trunk/README \
http://svn.collab.net/repos/svn/branches/issue-1003-dev/README

and note that the branch files all contain line-feeds. Looks like
another(?) svn:eol-style problem. It might be a good idea to fix the
branch before attempting to merge it back onto the trunk.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 15 01:31:12 2003

This is an archived mail posted to the Subversion Dev mailing list.