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

Re: problem merging to ACE_wrappers

From: Christopher Ness <chris_at_nesser.org>
Date: 2005-06-17 19:31:19 CEST

On Fri, 2005-06-17 at 18:26 +0200, Peter Hercek wrote:
> I don't think this is the problem. When I omit the last argument the current
> directory should be used. And the merge actually starts even with the two
> arguments.
> It failes after working for about 2 minutes and modifying a lot of files in
> the working copy.

Hi Peter,

I kept waiting for this to show up in my list folder, but I see you
replied off list, maybe to save me some shame of not reading the full
help page on merge.

You are correct about W_PATH being . if not set.

Now, as for why it is failing - I have no idea but your paths seem funny
to me in the command. What are the changes that are being made? Have
you tried doing a `svn diff` and getting a patch file out of SVN to see
what is going on.

You could then try applying it with the `patch` program. Though this is
rather annoying. But perhaps patch would throw more interesting errors
than what `svn merge` is giving you.

It's not much help, just another way to look at the problem.

Cheers,
Chris

-- 
Wireless Group,
McMaster University
finger.localdomain
13:26:03 up 1 day, 21:50, 2 users, load average: 0.13, 0.04, 0.01
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 17 19:33:37 2005

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