Additions:
$ svn ci -m "svn merge -r1001:1002 http://my.svn.repo/trunk"
Additions:
----
REFERRERS
{{backlinks}}
Additions:
Merge just changes between revisions 1001 and 1002 trunk into your local branch !
$ svn merge --dry-run -r1001:1002 http://my.svn.repo/trunk
and if this looks ok then
$ svn merge -r1001:1002 http://my.svn.repo/trunk
$ svn merge --dry-run -r1001:1002 http://my.svn.repo/trunk
and if this looks ok then
$ svn merge -r1001:1002 http://my.svn.repo/trunk
Deletions:
By default svn diff compares your local copy with its BASE revision in your svn repo
$ svn diff myfile
so if %%svn status -u%%
is showing file has changed but you cant see any differences you need to force svn diff to compare your local copy with the HEAD revision in svn repo
$ svn diff -rHEAD myfile