[PATCH 2 of 3 STABLE] convert/svn: make the sink remove empty directories

Matt Mackall mpm at selenic.com
Tue Dec 6 12:01:20 CST 2011


On Tue, 2011-12-06 at 14:03 +0100, Patrick Mézard wrote:
> Le 05/12/11 22:08, Matt Mackall a écrit :
> > On Fri, 2011-12-02 at 18:28 +0100, Patrick Mezard wrote:
> >> # HG changeset patch
> >> # User Patrick Mezard <pmezard at gmail.com>
> >> # Date 1322843294 -3600
> >> # Branch stable
> >> # Node ID 8e8b2cd69ee18ab1bfa4e3a0e4f4a5ebd08a9deb
> >> # Parent  e317a36f99b908f1fc8346e174c0a44075dc7ef2
> >> convert/svn: make the sink remove empty directories
> > 
> > Dropping this one, it doesn't pass tests here:
> > 
> > @@ -393,10 +393,11 @@
> >    converting...
> >    0 remove last file of directory
> >    $ svnupanddisplay a-hg-wc 1
> > +  At revision 3.
> >     3 3 test .
> >     3 1 test d1
> >     3 1 test d1/a
> > -  <?xml version="1.0"*?> (glob)
> > +  <?xml version="1.0"?>
> >    <log>
> >    <logentry
> >       revision="3">
> > 
> > This could be a side-effect of me skipping patch 1.
> 
> Maybe for the "At revision 3", the <xml> glob is more mysterious, or maybe "*" does not match zero-character?

The test harness gave up on the first mismatched line and threw the
original raw output at diff.

> By curiosity, what subversion version do you have?

1.6.12 (firefly) and 1.6.17 (local).

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list