Using TortoiseMerge to patch non-SVN files

[Jeremy Morton]

Hi,

Whilst I'm aware that TortoiseMerge is designed to patch one SVN
revision of a file with a particular patch, it'd be nice if it could
just apply the patch to a file without SVN info in the .patch; that is,
I'm effectively telling it 'this is the correct file to patch, just go
ahead and patch it with this patch'. Can TortoiseMerge do this? If
not, why not? If it can, then could anyone help me out with why this
isn't working?

http://www.game-point.net/misc/mypatch.htm

I copy that to the same directory as my ClientBroadcastStream.java file,
and try to apply the patch. It asks me to navigate to a directory, I
navigate to the same directory as ClientBroadcastStream.java, but then
it just doesn't display any files.

Best regards,
Jeremy Morton (Jez)

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1685960

To unsubscribe from this discussion, e-mail: [users-un...@tortoisesvn.tigris.org].

[web...@tigris.org]

Hi,

http://www.game-point.net/misc/mypatch.htm

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1686236

[Jeremy Morton]

Hi,

http://www.game-point.net/misc/mypatch.htm

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1686307

[Stefan Küng]

Jeremy Morton wrote:
> Hi,
>
> Whilst I'm aware that TortoiseMerge is designed to patch one SVN
> revision of a file with a particular patch, it'd be nice if it could
> just apply the patch to a file without SVN info in the .patch; that is,
> I'm effectively telling it 'this is the correct file to patch, just go
> ahead and patch it with this patch'. Can TortoiseMerge do this? If
> not, why not? If it can, then could anyone help me out with why this
> isn't working?
>
> http://www.game-point.net/misc/mypatch.htm

This patch doesn't contain the
Index: xxxxx
line, which makes it incompatible with TortoiseMerge.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1712689