Max Bowsher wrote:
>
> Blair Zajac wrote:
> > Hello,
> >
> > We've got a CVS repository that generates this empty txn:
> > ......
> > I could potentially supply a portion of the repository that generates
> > this problem, but it would take a little work. Let me know.
> >
> > In the mean time, does anybody think there's an easy bug to fix?
> > There may be a simple test that could be added to cvs2svn.py to
> > not make a tag or branch unless there's something actually being
> > tagged or branched.
>
> Actually, it already does something like this.
> I have a vague feeling that this might disappear when I solve issue 1515
> "complex branches not reproduced correctly.".
> Could you apply the following patch:
> Index: cvs2svn.py
> ===================================================================
> --- cvs2svn.py (revision 7032)
> +++ cvs2svn.py (working copy)
> @@ -975,6 +975,8 @@
> self.add_dir,
> svn_src_path, svn_src_rev,
> entries)
> + print "COPY PATH: %s %s <- %d %s" \
> + % (change.op, svn_dst_path, svn_src_rev, svn_src_path)
> if change.op == 'A':
> # We don't need to include "Node-kind:" for copies; the loader
> # ignores it anyway and just uses the source kind instead.
>
> and let me have the complete output of cvs2svn during pass 4?
Max,
Here you go.
----- pass 4 -----
committing: Mon Jan 28 12:29:08 2002, over 0 seconds
adding or changing 1.1 : trunk/aaa/Docs/bbb/ccc/ddd.tex
new revision: 1
committing: Mon Jan 28 12:29:09 2002, over 0 seconds
COPY PATH: A branches/AM <- 1 trunk
new revision: 2
committing: Mon Feb 4 08:38:28 2002, over 0 seconds
adding or changing 1.2 : trunk/aaa/Docs/bbb/ccc/ddd.tex
new revision: 3
committing: Mon Feb 4 08:38:25 2002, over 5 seconds
adding or changing 1.1 : trunk/aaa/Docs/bbb/eee/Web/fff.waf
adding or changing 1.1 : trunk/aaa/Docs/bbb/eee/Web/ggg.waf
adding or changing 1.1 : trunk/aaa/Docs/bbb/eee/Web/hhh.waf
new revision: 4
committing: Mon Dec 2 09:39:40 2002, over 0 seconds
adding or changing 1.1 : trunk/aaa/Docs/Miscellaneous/iii.txt
new revision: 5
committing: Wed Feb 26 09:30:57 2003, over 0 seconds
adding or changing 1.1 : trunk/aaa/Docs/Reports/jjj.doc
new revision: 6
committing: Wed Feb 26 09:30:40 2003, over 0 seconds
adding or changing 1.1 : trunk/aaa/Docs/Miscellaneous/kkk.txt
adding or changing 1.1 : trunk/aaa/Docs/Miscellaneous/lll.txt
new revision: 7
committing: Wed Feb 26 09:32:10 2003, over 0 seconds
adding or changing 1.2 : trunk/aaa/Docs/Reports/jjj.doc
new revision: 8
committing: Thu Feb 27 09:23:22 2003, over 0 seconds
adding or changing 1.1 : trunk/aaa/Docs/Reports/mmm.doc
new revision: 9
committing: Fri Mar 14 08:52:22 2003, over 1 seconds
adding or changing 1.1 : trunk/aaa/Docs/bbb/nnn/ooo.doc
adding or changing 1.2 : trunk/aaa/Docs/Reports/mmm.doc
adding or changing 1.1 : trunk/aaa/Docs/bbb/ccc/ppp.doc
adding or changing 1.1 : trunk/aaa/Docs/bbb/nnn/qqq.doc
adding or changing 1.1 : trunk/aaa/Docs/Reports/rrr.doc
adding or changing 1.1 : trunk/aaa/Docs/Reports/sss.doc
new revision: 10
committing: Mon Mar 17 13:36:21 2003, over 1 seconds
adding or changing 1.1 : trunk/aaa/Docs/Reports/ttt.doc
adding or changing 1.1 : trunk/aaa/Docs/Reports/uuu.doc
adding or changing 1.3 : trunk/aaa/Docs/Reports/mmm.doc
adding or changing 1.1 : trunk/aaa/Docs/Reports/vvv.doc
adding or changing 1.1 : trunk/aaa/Docs/Reports/www.doc
adding or changing 1.1 : trunk/aaa/Docs/Reports/xxx.doc
adding or changing 1.1 : trunk/aaa/Docs/Reports/yyy.doc
new revision: 11
committing: Thu Mar 27 13:27:07 2003, over 1 seconds
adding or changing 1.1 : trunk/aaa/Docs/bbb/nnn/zzz.doc
adding or changing 1.2 : trunk/aaa/Docs/bbb/nnn/ooo.doc
adding or changing 1.2 : trunk/aaa/Docs/bbb/ccc/ppp.doc
adding or changing 1.2 : trunk/aaa/Docs/bbb/nnn/qqq.doc
adding or changing 1.4 : trunk/aaa/Docs/Reports/mmm.doc
new revision: 12
Finishing branches:
finishing 'AM_1' as branch
finishing 'AM' as branch
COPY PATH: - branches/AM/aaa <- 1 trunk/aaa
Finishing tags:
finishing 'AM_1' as tag
COPY PATH: A tags/AM_1 <- 2 branches/AM
finishing 'AM' as tag
12 commits processed.
----- pass 5 -----
Best,
Blair
--
Blair Zajac <blair@orcaware.com>
Plots of your system's performance - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 12 00:23:35 2003