search

neo618 / tortoisesvn

Automatically exported from code.google.com/p/tortoisesvn
0 stars 0 forks source link

Implement svn patch #33

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
svn 1.7 has its own patching function.

Use that patch function in TortoiseMerge instead of our own custom one.
Of course this should be done in a way so we don't loose any features we
already have.

Original issue reported on code.google.com by tortoisesvn on 19 May 2010 at 6:19

GoogleCodeExporter commented 9 years ago

Original comment by tortoisesvn on 20 May 2010 at 7:12

GoogleCodeExporter commented 9 years ago 
r19593 added the class SVNPatch which implements the svn_client_patch.

But I'll keep the original patch implementation of TortoiseMerge for now, since
svn_client_patch doesn't as well as it should.
See this mail for details about that:
http://article.gmane.org/gmane.comp.version-control.subversion.devel/120144

Attached a patch which makes use of the SVNPatch class instead of the original
CPatch. This patch can be applied once svn_client_patch is good enough.

Original comment by tortoisesvn on 21 May 2010 at 8:37

Attachments:

GoogleCodeExporter commented 9 years ago 
the patch api changed on the svn trunk.
r19638 adjusted for the api changes so the build succeeds again, but wasn't 
tested.

Original comment by tortoisesvn on 30 May 2010 at 11:32

GoogleCodeExporter commented 9 years ago

Original comment by tortoisesvn on 5 Jun 2010 at 7:21

GoogleCodeExporter commented 9 years ago 
This issue was updated by revision r19665.

We still need a way to show the rejected patch hunks to the user.

Original comment by tortoisesvn on 5 Jun 2010 at 3:50

GoogleCodeExporter commented 9 years ago 
This issue was closed by revision r19675.

Original comment by tortoisesvn on 7 Jun 2010 at 7:44