RE: [TSVN] FW: Flyspray task #72 - Easy application of patches

Hi Folks,

I was away for a few hours, so I'm jumping in late.

> > A. Right click on WC folder and apply patch. TMerge knows
> where to apply
> > it, and asks for a patch file. It is getting the WC information from
> > somewhere.
>
> TMerge gets a path to a folder. Folder? Hmm - that has to be
> the target.
>
> > B. Right click on a patch file. TMerge knows what to apply
> and asks for
> > a WC.
>
> TMerge gets a path to a file. File? I guess that must be the
> diff/patch file then.
>
> No information about wc or not wc.

C. Right click on a patch file inside a WC and apply patch. Tmerge gets a
folder -> must be the target and a file -> must be the patch file. Plus the
shell knows whether the context menu was opened on a WC or not.

1)Outside a WC:
A) Tortoisemerge /path:C:\SVN\NoWCDir
B) Tortoisemerge /path:C:\SVN\NoWCDir /file:C:\SVN\TortoiseSVN\my.patch

2) Inside a WC:
A) Tortoisemerge /wc /path:C:\SVN\TortoiseSVN
C) Tortoisemerge /wc /path:C:\SVN\TortoiseSVN
/file:C:\SVN\TortoiseSVN\my.patch
or
A) Tortoisemerge /wcpath:C:\SVN\TortoiseSVN
C) Tortoisemerge /wcpath:C:\SVN\TortoiseSVN
/file:C:\SVN\TortoiseSVN\my.patch

You can use approach 2) to make sure that Tmerge always knows when a patch
was applied from inside a WC.

Cheers
- Lübbe

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org