Re: import inconsistency

[Paul Edwards]

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
news:mailman.7602.1055182195.21513.bug-cvs@gnu.org...
> Please include ChangeLog entries and sanity.sh test cases with patches
> you'd like us to accept, as per the ccvs/HACKING file.
>
> Also, please send patches in universal (-u) or context (-c) diff format!

Index: ChangeLog
===================================================================
RCS file: /development/repository/ccvs/ChangeLog,v
retrieving revision 1.1.1.7
diff -c -r1.1.1.7 ChangeLog
*** ChangeLog   27 May 2003 10:00:06 -0000      1.1.1.7
--- ChangeLog   10 Jun 2003 12:23:55 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2003-06-10  Paul Edwards
+
+       * import.c: make imported files move out of Attic
+       * sanity.sh: added import2
+
  2003-05-25  Derek Price  <derek@ximbiot.com>

        * configure.in: Update CVS version to 1.11.6.
Index: src/import.c
===================================================================
RCS file: /development/repository/ccvs/src/import.c,v
retrieving revision 1.1.1.5
diff -c -r1.1.1.5 import.c
*** src/import.c        30 Dec 2002 19:31:59 -0000      1.1.1.5
--- src/import.c        10 Jun 2003 12:06:29 -0000
***************
*** 694,699 ****
--- 694,704 ----
        letter = 'U';
      add_log (letter, vfile);

+     if (inattic)
+     {
+         RCS_setattic(vers->srcfile, 0);
+     }
+
      freevers_ts (&vers);
      return (0);
  }
Index: src/sanity.sh
===================================================================
RCS file: /development/repository/ccvs/src/sanity.sh,v
retrieving revision 1.1.1.6
diff -c -r1.1.1.6 sanity.sh
*** src/sanity.sh       27 May 2003 10:04:20 -0000      1.1.1.6
--- src/sanity.sh       10 Jun 2003 12:22:39 -0000
***************
*** 3890,3895 ****
--- 3890,3920 ----
                rm -rf ${CVSROOT_DIRNAME}/first-dir
                ;;

+     import2)
+         # Test Import
+         mkdir ${CVSROOT_DIRNAME}/aaa
+         ${testcvs} checkout aaa >/dev/null 2>&1
+         cd aaa
+         echo aaa >one.c
+         ${testcvs} add one.c >/dev/null 2>&1
+         ${testcvs} commit -m "." one.c >/dev/null 2>&1
+         ${testcvs} tag -b btag one.c >/dev/null 2>&1
+         ${testcvs} update -r btag >/dev/null 2>&1
+         cp one.c two.c
+         ${testcvs} add two.c >/dev/null 2>&1
+         ${testcvs} commit -m "." two.c >/dev/null 2>&1
+         mkdir ccc
+         cd ccc
+         echo xxx >two.c
+         ${testcvs} import -I ! -m test aaa bbb ccc >/dev/null 2>&1
+         cd ..
+         dotest import2-1 'test -f ${CVSROOT_DIRNAME}/aaa/two.c,v'
+
+         cd ..
+         rm -fr aaa
+         rm -fr ${CVSROOT_DIRNAME}/aaa
+         ;;
+
        rdiff)
                # Test rdiff
                # XXX for now this is just the most essential test...