You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Nathaniel E Baughman <ne...@twcny.rr.com> on 2004/08/07 14:29:40 UTC

[BOOK]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


First, _Version Control with Subversion_ is THE BEST technical manual I have
ever read. I'm relatively green in the world of revision control, but your book
elegantly combines the technical with the practical with the theoretical. Thank
you for making it free. I will buy a copy just to support your work and the
publisher that makes this possible.

Now my suggestion. In the section "Previewing Merges"
(http://svnbook.red-bean.com/svnbook/book.html#svn-ch-4-sect-3.2.2), you explain
that "--dry-run" shows what would happen during a merge. I recommend a
caveat/warning be added: "--dry-run" can report errors that would not happen
during a real merge.

Say we're merging from branch to trunk:

1) Suppose a directory with files was added to the branch. The merge dry run
will show the directory being added, but all the files in it fail to add because
the dry run didn't really create the directory: "Skipped missing target" errors
reported.

2) Suppose a file was added to the branch and subsequently updated in the
branch. The merge dry run will show the file being added, but the subsequent
update will fail: "File not under version control" errors reported.


This came about because I was too chicken to do a real merge before getting an
error-free dry run. That's just how I operate. I've seen posts where others
encounter the same dillema.

I hope this is worthwhile input -- Nathan


PS  Using thhgttg.txt in an example was a great idea. Geeks everywhere probably
recognize that string on sight.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBFOdUEiq2vqnq5eURAgQ/AJ9uTMne714+6ncRbwYgMomgEElFwQCfVuad
p+64tFr68h0Ae8pVyOL2JPU=
=qAl7
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [BOOK]

Posted by Ben Collins-Sussman <su...@collab.net>.
On Sat, 2004-08-07 at 09:29, Nathaniel E Baughman wrote:

> Now my suggestion. In the section "Previewing Merges"
> (http://svnbook.red-bean.com/svnbook/book.html#svn-ch-4-sect-3.2.2), you explain
> that "--dry-run" shows what would happen during a merge. I recommend a
> caveat/warning be added: "--dry-run" can report errors that would not happen
> during a real merge.

Thanks for the mail;  this is a well-known bug, issue 1943:

   http://subversion.tigris.org/issues/show_bug.cgi?id=1943

The answer, of course, is to fix the bug, not change the documentation.
:-)




---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org