Free Software Server Environment: Subversion Merge

Revision [727]

Most recent edit made on 2008-08-21 12:39:17 by FsseInfo

Additions:

$ svn ci -m "svn merge -r1001:1002 http://my.svn.repo/trunk∞"

Revision [726]

Edited on 2008-08-21 12:33:11 by FsseInfo

Additions:

REFERRERS
SubVersion

Revision [721]

Edited on 2008-08-21 12:15:35 by FsseInfo

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∞

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

Revision [720]

The oldest known version of this page was edited on 2008-08-21 12:11:30 by FsseInfo

Subversion Merge

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