More merge conflicts
Date: Tue Jun 15 00:36:09 PDT 2004
Workarea: snort.melbourne.sgi.com:/home/ajones/source/2.4.x-xfs
Inspected by: nathans, ivanr, tes
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: xfs-cmds:slinx:173570a
cmd/xfstests/019 - 1.12
cmd/xfstests/021 - 1.20
cmd/xfstests/040 - 1.12
cmd/xfstests/041 - 1.15
cmd/xfstests/check - 1.19
cmd/xfstests/common.dump - 1.49
cmd/xfstests/new - 1.11
cmd/xfstests/src/Makefile - 1.25
cmd/xfstests/m4/Makefile - 1.3
cmd/xfstests/m4/package_xfslibs.m4 - 1.5
cmd/xfstests/aclocal.m4 - 1.5
cmd/xfstests/085 - 1.5
Subject: TAKE 916290 -
More merge fixes
Date: Tue Jun 15 01:10:50 PDT 2004
Workarea: snort.melbourne.sgi.com:/home/ajones/source/2.4.x-xfs
Inspected by: ,,nathans, tes, ivanr
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: xfs-cmds:slinx:173572a
cmd/xfstests/src/Makefile - 1.26
- incorrect target. fixed
cmd/xfstests/aclocal.m4 - 1.6
- error with headers. fixed.
cmd/xfstests/085 - 1.6
- This test was missing from the origional merge
Subject: TAKE 916290 -
Fix merge issues.
Date: Tue Jun 15 22:38:57 PDT 2004
Workarea: snort.melbourne.sgi.com:/home/ajones/source/2.4.x-xfs
Inspected by: nathans,tes,ivanr
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: xfs-cmds:slinx:173634a
cmd/xfstests/027 - 1.8
- Removed debug flag.
cmd/xfstests/check - 1.20
- fixed double reporting problem
cmd/xfstests/065.out - 1.3
- Updated to correct state.
cmd/xfstests/067 - 1.12
- removed debug flag
cmd/xfstests/071.out - 1.4
- fixed white space error
cmd/xfstests/082.out - 1.5
- fixed white space error
Subject: TAKE 916290 -
Fixed merge issue with TIMESTAMP string printing twice.
Date: Thu Jun 17 01:29:19 PDT 2004
Workarea: snort.melbourne.sgi.com:/home/ajones/source/2.4.x-xfs
Inspected by: nathans
The following file(s) were checked into:
bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs
Modid: xfs-cmds:slinx:173773a
cmd/xfstests/check - 1.22
- Fixed merge issue with TIMESTAMP string printing twice.
|