From cf46733632c7279a9fd0fe6ce26f9185a4ae82a9 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Sat, 5 Aug 2017 16:22:51 +0000 Subject: subversion-1.9.7 --- doc/user/svn-best-practices.html | 48 +++++++--------------------------------- 1 file changed, 8 insertions(+), 40 deletions(-) (limited to 'doc/user/svn-best-practices.html') diff --git a/doc/user/svn-best-practices.html b/doc/user/svn-best-practices.html index 61ba1c6..b168786 100644 --- a/doc/user/svn-best-practices.html +++ b/doc/user/svn-best-practices.html @@ -53,7 +53,7 @@ root" contains exactly three subdirectories: /trunk, only one project root, or it may contain a number of them.

Book reference: Choosing + href="http://svnbook.red-bean.com/nightly/en/svn.reposadmin.planning.html#svn.reposadmin.projects.chooselayout">Choosing a Repository Layout.

@@ -70,10 +70,8 @@ change. You can mention this revision number in bug databases, or use it as an argument to svn merge should you want to undo the change or port it to another branch.

-

Book reference: "Subversion and Changesets" sidebar, - within chapter - 4.

+

Book reference: Changesets.

@@ -91,8 +89,11 @@ and your issue-tracking database as possible:

+

Track merges manually

+

### OBSOLETE RECOMMENDATION ###

+

When committing the result of a merge, be sure to write a descriptive log message that explains what was merged, something like:

@@ -103,6 +104,7 @@ like:

href="http://svnbook.red-bean.com/svnbook/ch04s03.html#svn-ch-4-sect-3.2">Tracking merges manually, and Merging a whole branch to another.

+
@@ -134,8 +136,7 @@ revision, and everything else is at an older revision.

Book reference: The - limitation of mixed revisions.

+ href="http://svnbook.red-bean.com/nightly/en/svn.basic.in-action.html#svn.basic.in-action.mixedrevs">Mixed-revision working copies.

@@ -180,39 +181,6 @@ of patient waiting while your client chugs away. You can rest assured, however, that unlike CVS, your large files won't incapacitate the server or affect other users.

- - -

Work around commands that don't understand copies/renames

- -

When a file or directory is copied or renamed, the Subversion repository -tracks that history. Unfortunately in Subversion 1.0, the only client -subcommand which actually takes advantage of this feature is svn -log. A number of other commands (such as svn diff and -svn cat) ought to be automatically following rename-history, -but aren't doing so yet.

- -

In all of these cases, a basic workaround is to use 'svn log --v' to discover the proper path within the older revision.

- -

For example, suppose you copied /trunk to -/branches/mybranch in revision 200, and then committed some -changes to /branches/mybranch/foo.c in subsequent revisions. -Now you'd like to compare revisions 80 and 250 of the file.

- -

If you have a working copy of the branch and run svn diff --r80:250 foo.c, you'll see an error about -/branches/mybranch/foo.c not existing in revision 80. To -remedy, you would run svn log -v on your branch or file to -discover that it was named /trunk/foo.c prior to revision 200, -and then compare the two URLs directly:

- -
-   $ svn diff http://.../trunk/foo.c@80 \
-              http://.../branches/mybranch/foo.c@200
-
- - -

Know when to create branches

-- cgit v1.2.1