Re: CVS update: subversion/subversion/libsvn_fs structure

Branko =?ISO-8859-2?Q?=C8ibej?= <brane@xbc.nu> writes:

> $ svn add foo.c
> $ svn rm foo.c
> $ svn commit
>
> I'd say that /this/ sequence is as much a PITA as yours. :-)

I recently spent a week handling cases like this in the WC.

In the case above, the `add' call creates a new entry in the entries
file marked for addition, and the `rm' call removes the entry
completely; so the commit has no idea it ever happened.

I also handle a case like this:

$ svn rm foo.c
$ touch foo.c
$ svn add foo.c

This marks foo.c for *both* deletion and addition, and when driving
the commit editor, the delete and then the add happen in exactly that
order.

Here's another weird case we handle:

$ svn rm foo.c
$ touch foo.c
$ svn add foo.c
$ svn rm foo.c

In this case, the last command just unsets the `add' flag in the
entry, leaving just a `delete' flag left.

Fun, isn't this? :)

> An "svn cp" from a source that has been added but not committed can only
> mean "cp; svn add". I hope.

Exactly.
Received on Sat Oct 21 14:36:21 2006