[Svnmerge] Using svnmerge in a subdirectory

[Daniel Rall]

On Thu, 19 Oct 2006, Thomas Heller wrote:

> Is it possible to use svnmerge in a subdirectory?

Yes and no.  svnmerge.py does exact tree-to-tree versioning.  It does
not really support sub-tree versioning (at least, not in any
particularly usable way).

While you can attempt sub-tree versioning, it's not likely to do
exactly what you want, nor is a good idea to mix with integration
information higher up in your tree (since you'll have to keep the
merge info in sync manually).
 
> In the top directory it is no problem:
> 
>   c:\svn\release25-maint>svnmerge init
>   property 'svnmerge-integrated' set on '.'
> 
>   c:\svn\release25-maint>svn revert .
>   Rückgängig gemacht: '.'
> 
>   c:\svn\release25-maint>

'svnmerge init' detected the "copyfrom" information for the
"release25-maint" directory (the top of your branch).  It used this as
your merge source, and marked all revisions from that source as
"already integrated".

> But in a subdirectory:
> 
>   c:\svn\release25-maint>cd Modules\_ctypes
> 
>   c:\svn\release25-maint\Modules\_ctypes>svnmerge init
>   svnmerge: no copyfrom info available. Explicit head argument (-S/--head) required.
> 
>   c:\svn\release25-maint\Modules\_ctypes>

What exactly are you trying to do here?


...
>   c:\svn\release25-maint\Modules\_ctypes>svnmerge -h init
>   usage: svnmerge init [OPTION...] [HEAD]
> 
>   Initialize merge tracking from HEAD on the current working directory.
> 
>   If HEAD is specified, all the revisions in HEAD are marked as already merged; if this is not correct, you can use
>   --revision to specify the exact list of already-merged revisions.
> 
>   If HEAD is omitted, then it is computed from the "svn cp" history of the current working directory (searching back for the branch point); in this case, svnmerge assumes that no revision has been integrated yet since the branch point (unless you teach it with --revision).
...
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20061019/dc5b66cc/attachment-0002.pgp>