| Problems with "Synchronize with patch" [message #548878] |
Fri, 23 July 2010 10:54  |
 Mauro Molinari
Messages: 285
Registered: July 2009 |
Senior Member |
|
|
Hello!
I have a problem to apply a patch with "Synchronize with Patch".
If I paste the patch source in the Synchronize View, the "Apply Patch"
Window appears and asks to select the target "file, folder or project".
I select the project and click on "Next", but nothing happens.
If I click on Finish, then the Synchronize view is populated. I can get
the same result using the Synchronize Wizard.
However, I have another problem then. I have a patch for a single file
with an only segment and this segment cannot be applied directly
(because it does not match). In the Synchronize View I see that file
marked with the conflict icon. However, if I double click on it, the
Compare Editor shows no differences between the "local" (unpatched) file
and the "remote" (patched) file, with no clue of the conflicts. So, I
know there are conflicts, but I can't see which conflicts there are and
I can't do any action to try to solve them.
I hoped that the "Synchronize with Patch" could help to apply patches in
an easier way than the "Apply Patch" wizard, especially when there are
umatched segments...
Anybody has ever had these problems? Should I open a bug? The problem is
that I don't know if I can reproduce with a small test case...
Mauro.
|
|
|
|
| Re: Problems with "Synchronize with patch" [message #550768 is a reply to message #548878] |
Wed, 04 August 2010 10:01  |
Tomasz Zarna
Messages: 172
Registered: July 2009 |
Senior Member |
|
|
| Mauro Molinari wrote on Fri, 23 July 2010 12:54 | If I paste the patch source in the Synchronize View, the "Apply Patch"
Window appears and asks to select the target "file, folder or project".
I select the project and click on "Next", but nothing happens.
|
This sounds like a bug to me.
| Mauro Molinari wrote on Fri, 23 July 2010 12:54 | I have a patch for a single file
with an only segment and this segment cannot be applied directly
(because it does not match). In the Synchronize View I see that file
marked with the conflict icon. However, if I double click on it, the
Compare Editor shows no differences between the "local" (unpatched) file
and the "remote" (patched) file, with no clue of the conflicts. So, I
know there are conflicts, but I can't see which conflicts there are and
I can't do any action to try to solve them.
|
You don't see any diffs in the compare editor simpy because none of the hunks in the file can be matched. To fix that you'll need to switch to Patch Contents model, where you can examine which hunks (parts of the file being patched) are matched and which are not. What is great about sync'ing with patch is that you can use the same patch options known from the wizard to adjust the patch (eg. fuzz factor) but at the same time you can also edit the file being patch and see the results right away.
Please give it another try and ping me in case of further question or open a bug if you spot one* 
Cheers
* please make sure you don't duplicate an existing bug
[Updated on: Wed, 04 August 2010 10:03] Report message to a moderator |
|
|
Powered by
FUDForum. Page generated in 0.04394 seconds
] 
Search
Help
Register
Login
Home
