You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Peter Hercek <pe...@syncad.com> on 2005/06/17 12:53:10 UTC
problem merging to ACE_wrappers
Hi,
We use svn for a project which uses ACE/TAO library (ACE_wrappers). I tried to
merge vendor changes to our branch. It failes on both windows (abnormal program
termination) and linux (Aborted.).
Here are the commands I'm doing:
svn co svn://svn/trunk/lib/ACE_wrappers
cd ACE_wrappers
svn merge svn://svn/tags/lib/ACE_wrappers/ACE_5_3_1_and_TAO_1_3_1
svn://svn/tags/lib/ACE_wrappers/ACE_5_4_5_and_TAO_1_4_5
The merge is the command which fails.
Any idea what to do with this?
Thanks,
Peter.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: problem merging to ACE_wrappers
Posted by Peter Hercek <pe...@syncad.com>.
On Fri, 17 Jun 2005 13:31:19 -0400, Christopher Ness wrote:
> 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.
:-) I wish I would, I have probably misconfigured news reader on
the other machine, when I posted to the groop it returned back
complaining about illegal header. I'm curious if this will go ok.
>
> 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.
This is actually and interesting experiment. I generated the diff
sucessfuly. I'm not sure if it means that the problem is not on
the server. The patch can be applied with some (about 20) rejects.
Unfortunately this is not usable way in general. There were about
20,000 deletes and additions in the diff. To add and remove all
the files manually would kill me. I'll rather try to debug the
error or try to do it other way round: figure out the chagnes
we did and create patch from them ... and then just to kill our
trunk version and use vendor version with our patch ... it
should be less work this way.
Peter.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: problem merging to ACE_wrappers
Posted by Christopher Ness <ch...@nesser.org>.
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
Re: problem merging to ACE_wrappers
Posted by Christopher Ness <ch...@nesser.org>.
On Fri, 2005-06-17 at 14:53 +0200, Peter Hercek wrote:
> svn co svn://svn/trunk/lib/ACE_wrappers
> cd ACE_wrappers
> svn merge svn://svn/tags/lib/ACE_wrappers/ACE_5_3_1_and_TAO_1_3_1
> svn://svn/tags/lib/ACE_wrappers/ACE_5_4_5_and_TAO_1_4_5
Since you checked out the ACE_wrappers directory why not try to do a
working copy merge instead of on the server with the two URL's you used?
You need to give a 3rd argument which is the WC_PATH you want to apply
the merge changes to!
A merge example is given in the book in vendor branches, but it is
difficult to read in my firefox browser as the computer text appears
really large. There are 3 arguments to the merge command about 1/2 way
down the page.
http://svnbook.red-bean.com/en/1.1/ch07s05.html
Cheers,
Chris
--
Wireless Group,
McMaster University
finger.localdomain
10:11:25 up 1 day, 18:35, 2 users, load average: 0.09, 0.14, 0.09
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org