changeset 16972 | 5efe9c6a34fe |
parent 16913 | f2719b387380 |
child 17345 | 4f8054d3171b |
--- a/tests/test-convert-cvsnt-mergepoints.t Fri Jun 15 00:02:27 2012 +0200 +++ b/tests/test-convert-cvsnt-mergepoints.t Fri Jun 15 00:02:27 2012 +0200 @@ -91,6 +91,8 @@ $ echo xyzzy > foo.txt $ cvsci -m "merge1+clobber" foo.txt +#if unix-permissions + return to trunk and merge MYBRANCH1_2 $ cvscall -Q update -P -A @@ -200,5 +202,6 @@ Members: foo.txt:1.1.4.1->1.1.4.2 +#endif $ cd ..