Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Subversive » How do I merge a deletion into the branch?
How do I merge a deletion into the branch? [message #493302] Sat, 24 October 2009 15:16 Go to next message
L-E Mickos is currently offline L-E Mickos
Messages: 2
Registered: October 2009
Junior Member
I have a file that has been branched.
Then the trunk version was deleted.
How do I merge this deletion into the branch?

When I try to merge the file I always get the error message

Quote:
Merge status operation failed.
svn: '/xxxxx/trunk/filename.xml' path not found: 404 Not Found

[Updated on: Sat, 24 October 2009 15:16]

Report message to a moderator

Re: How do I merge a deletion into the branch? [message #493446 is a reply to message #493302] Mon, 26 October 2009 09:43 Go to previous messageGo to next message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello,

Probably you called merge operation in not correct way, e.g. specifying not
correct revisions range or url. You can check it, by using Preview: in Merge
dialog specify required input info and call Preview button in left below
corner where you'll see the results of merge. Also when calling Preview,
useful info is written in console (SVN Console), .i.e. how exactly svn merge
operation was called.
Also how did you call Merge action, e.g. from what tab and which input
parameters? I tried in the following way: select project and call Merge
action, then in 'URL' tab select corresponding project folder in trunk.

>I have a file that has been branched.
> Then the trunk version was deleted.
> How do I merge this deletion into the branch.
>
> When I try to merge the file I always get the error message
> Quote:
>> Merge status operation failed.
>> svn: '/xxxxx/trunk/filename.xml' path not found: 404 Not Found
>
Re: How do I merge a deletion into the branch? [message #493455 is a reply to message #493446] Mon, 26 October 2009 10:57 Go to previous messageGo to next message
L-E Mickos is currently offline L-E Mickos
Messages: 2
Registered: October 2009
Junior Member
I tried reintegrate first several times.
Then I tried the one URL.
Never understood how to use two URL in this case.

Would have liked to merge on the folder, but the file is situated in the root folder of a massive project I'm not ready to reintegrate yet.
Just wanted to merge this file deletion into my branch.



Re: How do I merge a deletion into the branch? [message #493613 is a reply to message #493455] Tue, 27 October 2009 08:56 Go to previous message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello,

>I tried reintegrate first several times.
Reintegrate can be used only once, i.e. after reintegrate branch is no
longer usable for further work. As you're trying to propogate changes from
trunk to branch, you need to use Merge dialog with 'URL' tab. If file was
deleted in a separate revision from other changes which you don't want to
apply, then make merge only for this revision.

>I tried reintegrate first several times.
> Then I tried the one URL.
> Never understood how to use two URL in this case.
>
> Would have liked to merge on the folder, but the file is situated in the
> root folder of a massive project I'm not ready to reintegrate yet. Just
> wanted to merge this file deletion into my branch.
>
>
>
>
Previous Topic:Merge conflicts not handled by compare view
Next Topic:Update results in error
Goto Forum:
  


Current Time: Sun Oct 26 01:04:19 GMT 2014

Powered by FUDForum. Page generated in 0.02408 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software