Is it possible to use svnmerge in a subdirectory?
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>
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>
Ok, so it needs some options. But how? I'm afraid I cannot understand the help
it gives:
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).
Command options:
-f [--commit-file] FILE : set the name of the file where the suggested log
message is written to (default:
svnmerge-commit-message.txt)
-r [--revision] REVLIST : specify a revision list, consisting of revision
numbers and ranges separated by commas,
e.g., "534,537-539,540"
Global options:
-F [--force] : force operation even if the working copy is not
clean, or there are pending updates
-n [--dry-run] : don't actually change anything, just pretend; implies
--show-changes
-s [--show-changes] : show subversion commands that make changes
-v [--verbose] : verbose mode: output more information about progress
-h [--help] : show help for this command and exit
-V [--version] : show version info and exit
c:\svn\release25-maint\Modules\_ctypes>
Thanks,
Thomas
_______________________________________________
Svnmerge mailing list
[email protected]
http://www.orcaware.com/mailman/listinfo/svnmerge
