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

Re: [Fwd: Merge BUG in Windows]

From: <kfogel_at_collab.net>
Date: 2003-11-10 20:10:14 CET

Pedro Beck Gomes da Costa <pbeck@ciberbit.pt> writes:
> I send the file in attachement. If I create a new Repository with only
> this file and checkout it and then create a branch and then change the
> file in the branche, when i try to merge it with the trunk i get the
> error.

What's the exact command line you use for the merge, and what is all
the output?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 10 20:52:35 2003

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