You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "S.Ramaswamy" <ra...@collab.net> on 2005/04/17 15:50:06 UTC

[PATCH] Stop 'svn import' from creating empty revisions (v4)

Stop 'svn import' from creating empty revisions, and organize
the import tests into a separate test script.

* build.conf
  Added import_tests.py to the list of test scripts.

* subversion/libsvn_client/commit.c
  (import_ctx_t) : New import context struct suggested by
    C.Michael Pilato. Currently only the repos_changed boolean
    is used to remember if changes were made to the repository.
  (import_dir) : Added an extra function parameter - 'import_ctx'.
    Set repos_changed to true if files or directories are added
    to the repository.
  (import) : Set repos_changed in the import_ctx to true if
    parent directories are added, or if a file is added.
    Abort an edit if no files or directories were added to the
    repository.

* subversion/tests/clients/cmdline/basic_tests.py
  (basic_import_executable) : Moved to import_tests.py.
  (basic_import_ignores) : Moved to import_tests.py.
  (test_list) : Removed 'basic_import_executable' and
    'basic_import_ignores' from the list of tests.

* subversion/tests/clients/cmdline/import_tests.py : New.
  (import_executable) : Previously basic_import_executable in
    basic_tests.py.
  (import_ignores) : Previously basic_import_ignores in
    basic_tests.py.
  (import_avoid_empty_revision) : New. Verify empty revisions
    cannot be created during an import.
  (test_list) : Added 'import_executable', 'import_ignores',
    and 'import_avoid_empty_revisions' to the list of tests.



Re: [PATCH] Stop 'svn import' from creating empty revisions (v4)

Posted by "C. Michael Pilato" <cm...@collab.net>.
Okay.  Committed in r14293.

"C. Michael Pilato" <cm...@collab.net> writes:

> "C. Michael Pilato" <cm...@collab.net> writes:
> 
> > "S.Ramaswamy" <ra...@collab.net> writes:
> > 
> > > * subversion/libsvn_client/commit.c
> > >   (import_ctx_t) : New import context struct suggested by
> > >     C.Michael Pilato. Currently only the repos_changed boolean
> > >     is used to remember if changes were made to the repository.
> > 
> > As only the 'repos_changed' is used, it's the only thing that should
> > be in the baton.  I've tweaked your code to move the other baton
> > members into a TODO comment.
> > 
> > The rest of the patch looks fine.  I'm testing now, and will probably
> > be committing up shortly.
> 
> Actually, there is one other complaint.  You needn't pass around the
> import context baton as a void * -- it's defined in this file, so you
> can pass it around as a 'struct import_ctx_t' and not have to futz
> with having both "import_ctx" and "imp_ctx".  I'll make this tweak,
> too.
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

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

Re: [PATCH] Stop 'svn import' from creating empty revisions (v4)

Posted by "C. Michael Pilato" <cm...@collab.net>.
"C. Michael Pilato" <cm...@collab.net> writes:

> "S.Ramaswamy" <ra...@collab.net> writes:
> 
> > * subversion/libsvn_client/commit.c
> >   (import_ctx_t) : New import context struct suggested by
> >     C.Michael Pilato. Currently only the repos_changed boolean
> >     is used to remember if changes were made to the repository.
> 
> As only the 'repos_changed' is used, it's the only thing that should
> be in the baton.  I've tweaked your code to move the other baton
> members into a TODO comment.
> 
> The rest of the patch looks fine.  I'm testing now, and will probably
> be committing up shortly.

Actually, there is one other complaint.  You needn't pass around the
import context baton as a void * -- it's defined in this file, so you
can pass it around as a 'struct import_ctx_t' and not have to futz
with having both "import_ctx" and "imp_ctx".  I'll make this tweak,
too.

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

Re: [PATCH] Stop 'svn import' from creating empty revisions (v4)

Posted by "C. Michael Pilato" <cm...@collab.net>.
"S.Ramaswamy" <ra...@collab.net> writes:

> * subversion/libsvn_client/commit.c
>   (import_ctx_t) : New import context struct suggested by
>     C.Michael Pilato. Currently only the repos_changed boolean
>     is used to remember if changes were made to the repository.

As only the 'repos_changed' is used, it's the only thing that should
be in the baton.  I've tweaked your code to move the other baton
members into a TODO comment.

The rest of the patch looks fine.  I'm testing now, and will probably
be committing up shortly.

Thanks, Ram.

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