Issue 75 in svnbook: svn merge --reintegrate does not match any of the 3 usage patterns

[svnbook at googlecode.com]

Status: New
Owner: ----
Labels: Type-Defect Priority-Medium

New issue 75 by chr... at lavabit.com: svn merge --reintegrate does not match  
any of the 3 usage patterns
http://code.google.com/p/svnbook/issues/detail?id=75

Svn merge --reintegrate appears to fit a forth usage pattern:
        4. merge --reintegrate sourceURL[@REV] [WCPATH]

I'm guessing that sourceURL must be a URL & that @REV is optional.

Perhaps this should be added to the svn (1.6.6) tool's help also.

Through trial & error I discovered the following.
Perhaps some of these too should be documented in the 'svn merge' section.

> alias svn_merge 'svn merge --username <ME> --password <PWD>  
> --non-interactive --dry-run'
> svn_merge --force --ignore-ancestry --record-only --reintegrate --change  
> 148 <URL-1 at M> <target-dir>
svn: -r and -c can't be used with --reintegrate

> svn_merge --force --ignore-ancestry --record-only --reintegrate  
> --revision 140:148 <URL-1 at M> <target-dir>
svn: -r and -c can't be used with --reintegrate

> svn_merge --force --ignore-ancestry --record-only --reintegrate <URL-2 at N>  
> <URL-1 at M> <target-dir>
svn: --reintegrate cannot be used with --ignore-ancestry or --record-only

> svn_merge --force --reintegrate <URL-2 at N> <URL-1 at M> <target-dir>
--- Merging differences between repository URLs into '<target-dir>':
...
#NOTE: svn completely (& silently) ignores the --reintegrate option.
#            Is that an error?  Should that be reported to the Subversion  
project?

> svn_merge --force --reintegrate <URL-2 at N> <target-dir>
svn: --force cannot be used with --reintegrate

> svn_merge --reintegrate <URL-2 at N> <target-dir>
svn: Cannot reintegrate into a working copy that has local modifications



--
You received this message because you are listed in the owner
or CC fields of this issue, or because you starred this issue.
You may adjust your issue notification preferences at:
http://code.google.com/hosting/settings