Developer forums (C::B DEVELOPMENT STRICTLY!) > CodeCompletion redesign

Patch utitilities and applying patches

<< < (2/3) > >>

ollydbg:
Firstly I report a feature request in patch utility's official site: https://savannah.gnu.org/bugs/?37128 , but finally they said it was already implemented. ;)

Now, I can nicely apply a patch (created from git) to svn repo.

Here is the steps: suppose you create patch from git(I use tortoisegit)
1, if you patch file has LF of EOL, convert it to CRLF. This can be done by Notepad++, Codeblocks editor, or any tools you like
2, run the patch command by:

--- Code: ---patch --binary <test.patch

--- End code ---
This works fine if your original source file is CRLF, the result file is still CRLF.

See the patch utility document:
http://linux.die.net/man/1/patch

Alpha:
By the way, if you use svn 1.7, the command:

--- Code: ---svn patch test.patch

--- End code ---
works for any line ending combination (at least, it has never had problems for me when mixing line endings).

ollydbg:

--- Quote from: Alpha on August 17, 2012, 02:05:11 pm ---By the way, if you use svn 1.7, the command:

--- Code: ---svn patch test.patch

--- End code ---
works for any line ending combination (at least, it has never had problems for me when mixing line endings).

--- End quote ---
Thanks.
I have not used the svn command line. I use TortoiseGit and TortoiseSVN. But I found that TortoiseSVN can not apply the patch generated by TortoiseGit. (For TortoiseSVN, when it need to apply a patch, it must have a exact svn revision information in the patch file, otherwise, it will report a failure, but the patch utility in MSYS works fine in this case)

MortenMacFly:

--- Quote from: ollydbg on August 17, 2012, 02:50:21 pm ---(For TortoiseSVN, when it need to apply a patch, it must have a exact svn revision information in the patch file, otherwise, it will report a failure)
--- End quote ---
Haha - this sounds familiar... probably you should file a bug report to the TortoiseSVN guys, too - lets see how fast they can fix it compared to my experience... 8)

BTW: Taking the risk to sound monotonous: I believe it is no good in general to create/provide patches based on a GIT repo for SVN. As you all see it is simply not compatible. However, I guess I am alone on that floor... :-\

oBFusCATed:

--- Quote from: MortenMacFly on August 17, 2012, 03:18:34 pm ---Haha - this sounds familiar... probably you should file a bug report to the TortoiseSVN guys, too - lets see how fast they can fix it compared to my experience... 8)

--- End quote ---
Are you saying that smartsvn supports pure git patches now? The patches provided by Jens are not pure git patches, but patches which work with tortoisesvn (at least the once created by the script I use work perfectly).

Navigation

[0] Message Index

[#] Next page

[*] Previous page