On Tue, Aug 30, 2011 at 10:47:38AM -0400, Rothkin, Steven wrote:
> I'm having some difficulty with merging to release branches that I
> haven't been able to find a solution for
> svn merge -c 9840 $SVNHVAURL/argus/trunk
This one should work.
Where do run this command?
It should be run
> -Original Message-
> From: Stefan Sperling [mailto:s...@elego.de]
> Sent: Tuesday, August 30, 2011 3:59 PM
> To: Rothkin, Steven
> Cc: users@subversion.apache.org
> Subject: Re: Merging from main trunk to release branch
>
> On Tue, Aug 30, 2011 at 10:47:38A
On Tuesday 30 August 2011, Rothkin, Steven wrote:
> I'm doing some testing and documentation in preparation for migrating
> from CVS to Subversion.
>
> I'm using svn, version 1.6.16 (r1073529) on Cygwin.
Concerning Cygwin, this is neither MS Windows nor Linux, and how much of each
also depends o
On Wed, Aug 31, 2011 at 4:14 AM, Ulrich Eckhardt
wrote:
> I.e. the whole file was marked as conflicted? This is an effect of conflicting
> line endings, as I initially mentioned. Try transcoding the file's line
> endings using dos2unix or unix2dos before merging and back afterwards. If the
> chan
> > I'm using svn, version 1.6.16 (r1073529) on Cygwin.
>
> Concerning Cygwin, this is neither MS Windows nor Linux, and how much of
> each also depends on the way it is configured. In particular, you can
> configure
> Cygwin to use DOS-style line endings or Unix-style line endings, in order to
>
> I’m doing some testing and documentation in preparation for migrating from
> CVS to Subversion.
> I’m using svn, version 1.6.16 (r1073529) on Cygwin.
>
> I’m having some difficulty with merging to release branches that I haven’t
> been able to find a solution for (other than continuing our old C
