David,
> > 1) Developers being able to create topics under a different=20
> > developer's e-mail, as well as the rights to delete topics.
> > - Suggested solution =3D> Add rights related to logging into=20
> > CodeStriker
> > Rights:
> > Admin Rights:
> > Delete topics
> > Add, Edit, Delete, Modify rights of users
> >
> > Basic Rights (functionality):
> > Create topics
> > "Your e-mail address field" will be disabled and=20
> > automatically filled in with user login (user e-mail)
> >
> > <For now we could add users via SQL into the database, but=20
> it would be=20
> > nice to have a "Users" section to "Add, Edit, Delete,=20
> Change rights,=20
> > etc.">
>=20
> Yes... I suspect we'll be working on this once we get 1.8.0=20
> out the door,=20
> this is something I am very keen to do. 1.8.0 will provide=20
> the capability=20
> to modify topic attributes, so having some form of security=20
> here will be=20
> useful, however 1.8.0 will also provide a complete audit=20
> trail of how a=20
> topic has been changed. We'll have something similar to how Bugzilla=20
> manages its users.
>=20
Awesome! Sounds really great. I look forward to the 1.8.0 update. Thanks
for the details of lots of interesting good stuff coming. :)
> > 2) Multiple differential data for the same CVS file. The=20
> scenario came=20
> > up that developers need to be able to commit code multiple times to=20
> > correlate work with another developer, but be able to save all the=20
> > differences that they have made to a particular file over a=20
> period of=20
> > time before the modifications were reviewed. Other developers would=20
> > also be committing their changes, so the differences saved=20
> should only=20
> > include what the first developer changed. Hopefully the following=20
> > example illustrates.
>=20
> This doesn't make any sense to me! Why can't you "fold" all of the=20
> differences together into one diff segment? This is how things are=20
> normally done in a Code reviewing situation, or when patch files are=20
> generated. Before generating a "cvs diff", you usually need=20
> to do a "cvs=20
> update -d" to ensure that your working copying is bought=20
> uptodate with=20
> what is in the repository. This will "merge" all changes=20
> together from=20
> other authors so that when you do a "cvs diff", all the=20
> changes are in one=20
> diff segment.
>=20
> I don't think this answers your question... perhaps if you=20
> can give a more=20
> detailed example from a process perspective as to when you=20
> would ever want=20
> to generate a diff file with multiple diff segments for the=20
> same file. In=20
> all cases, they are usually merged together into a single segment,=20
> otherwise its more work for the reviewer - they'd want to see=20
> all changes=20
> for a single file in one place, not in multiple places.
>=20
We may be going against the grain of normal review procedures, or maybe
I'm just not adequately describing the situation. Definitely I am open
to suggestion and learn from how other organizations conduct their
reviews. Let me take another try at describing what the scenario is that
we're confronting, and then let me know if this is still odd, or if it
is still unclear.
- 2 developers work on the same source file
source file (append.test) contents:
#This is a test
test =3D 0
#To see how to append
append =3D 0
#Differential information from different revisions
diffs =3D 0
#Into one diff file
file =3D 0
- Developer 1 begins to make changes
#This is a test
test =3D 0
#To see how to append
append =3D 1
#Differential information from different revisions
diffs =3D 0
#Into one diff file
file =3D 0
- Developer 2 begins to make changes
#This is a test
test =3D 0
#To see how to append
append =3D 0
#Differential information from different revisions
diffs =3D 1
#Into one diff file
file =3D 0
- Developer 1 performs an "update" to get latest changes before
committing their own. (Potentially needs to fix any conflicts.)
no updates
- Developer 1 performs a "diff" on the modified file, and the output is
parsed and redirected to a text file. (developer1.diff)
Index: append.test
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsrep/test/append.test,v
retrieving revision 1.1
diff -u -r1.1 append.test
--- append.test 6 Feb 2004 23:01:29 -0000 1.1
+++ append.test 6 Feb 2004 23:02:32 -0000
@@ -1,7 +1,7 @@
#This is a test
test =3D 0
#To see how to append
-append =3D 0
+append =3D 1
#Differential information from different revisions
diffs =3D 0
#Into one diff file
- Developer 1 commits changes creating revision 1.2
- Developer 2 performs an "update" to get latest changes before
committing their own. (Potentially needs to fix any conflicts.)
gets new changes from developer 1's commit
#This is a test
test =3D 0
#To see how to append
append =3D 1
#Differential information from different revisions
diffs =3D 1
#Into one diff file
file =3D 0
- Developer 2 performs a "diff" on the modified file, and the output is
parsed and redirected to a text file. (developer2.diff)
Index: append.test
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsrep/test/append.test,v
retrieving revision 1.2
diff -u -r1.2 append.test
--- append.test 6 Feb 2004 23:03:27 -0000 1.2
+++ append.test 6 Feb 2004 23:03:53 -0000
@@ -3,6 +3,6 @@
#To see how to append
append =3D 1
#Differential information from different revisions
-diffs =3D 0
+diffs =3D 1
#Into one diff file
file =3D 0
- Developer 2 commits changes creating revision 1.3
- Developer 1 begins to make changes
#This is a test
test =3D 0
#To see how to append
append =3D 1
#Differential information from different revisions
diffs =3D 0
#Into one diff file
file =3D 1
- Developer 2 begins to make changes
#This is a test
test =3D 1
#To see how to append
append =3D 1
#Differential information from different revisions
diffs =3D 1
#Into one diff file
file =3D 0
- Developer 1 performs an "update" to get latest changes before
committing their own. (Potentially needs to fix any conflicts.)
#This is a test
test =3D 0
#To see how to append
append =3D 1
#Differential information from different revisions
diffs =3D 1
#Into one diff file
file =3D 1
- Developer 1 performs a "diff" on the modified file, and the output is
parsed and redirected <concatenated this time> to a text file.
(developer1.diff)
Index: append.test
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsrep/test/append.test,v
retrieving revision 1.3
diff -u -r1.3 append.test
--- append.test 6 Feb 2004 23:04:49 -0000 1.3
+++ append.test 6 Feb 2004 23:06:27 -0000
@@ -5,4 +5,4 @@
#Differential information from different revisions
diffs =3D 1
#Into one diff file
-file =3D 0
+file =3D 1
- Developer 1 commits changes creating revision 1.4
- Developer 2 performs an "update" to get latest changes before
committing their own. (Potentially needs to fix any conflicts.)
#This is a test
test =3D 1
#To see how to append
append =3D 1
#Differential information from different revisions
diffs =3D 1
#Into one diff file
file =3D 1
- Developer 2 performs a "diff" on the modified file, and the output is
parsed and redirected <concatenated this time> to a text file.
(developer2.diff)
Index: append.test
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsrep/test/append.test,v
retrieving revision 1.4
diff -u -r1.4 append.test
--- append.test 6 Feb 2004 23:05:27 -0000 1.4
+++ append.test 6 Feb 2004 23:05:34 -0000
@@ -1,5 +1,5 @@
#This is a test
-test =3D 0
+test =3D 1
#To see how to append
append =3D 1
#Differential information from different revisions
- Developer 2 commits changes creating revision 1.5
- Developer 1's diff file (developer1.diff) should look like the
following:
Index: append.test
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsrep/test/append.test,v
retrieving revision 1.1
diff -u -r1.1 append.test
--- append.test 6 Feb 2004 23:01:29 -0000 1.1
+++ append.test 6 Feb 2004 23:02:32 -0000
@@ -1,7 +1,7 @@
#This is a test
test =3D 0
#To see how to append
-append =3D 0
+append =3D 1
#Differential information from different revisions
diffs =3D 0
#Into one diff file
Index: append.test
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsrep/test/append.test,v
retrieving revision 1.3
diff -u -r1.3 append.test
--- append.test 6 Feb 2004 23:04:49 -0000 1.3
+++ append.test 6 Feb 2004 23:06:27 -0000
@@ -5,4 +5,4 @@
#Differential information from different revisions
diffs =3D 1
#Into one diff file
-file =3D 0
+file =3D 1
- Developer 2's diff file (developer2.diff) should look like the
following:
Index: append.test
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsrep/test/append.test,v
retrieving revision 1.2
diff -u -r1.2 append.test
--- append.test 6 Feb 2004 23:03:27 -0000 1.2
+++ append.test 6 Feb 2004 23:03:53 -0000
@@ -3,6 +3,6 @@
#To see how to append
append =3D 1
#Differential information from different revisions
-diffs =3D 0
+diffs =3D 1
#Into one diff file
file =3D 0
Index: append.test
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsrep/test/append.test,v
retrieving revision 1.4
diff -u -r1.4 append.test
--- append.test 6 Feb 2004 23:05:27 -0000 1.4
+++ append.test 6 Feb 2004 23:05:34 -0000
@@ -1,5 +1,5 @@
#This is a test
-test =3D 0
+test =3D 1
#To see how to append
append =3D 1
#Differential information from different revisions
- Now that both tasks have been completed, both developers would like to
have each of their individual work reviewed.
- Each developer creates a separate CodeStriker topic, and
uploads/attaches their respective diff files.
<Problem:> When a topic is created, only a single file entry is created
for the "Contents:" list which is associated with the first encounter of
the filename in the uploaded diff file. (i.e. Index: append.test)
Subsequent entries of the same file are not associated with their
respective revisions. All subsequent diff entries for an identified file
entry is associated with the revision of the first encountered file
entry. The "Parallel" and "non-Parallel?" views feature is also broken
from this kind of diff file structure.
<Possible Solution:>When parsing the uploaded diff file, create a new
entry in the "Contents:" list for each file entry encountered in the
diff file. This should also preserve revisioning and maintain the
current "Parallel" and non-"Parallel" view functionality.
I hope this explains what is happening more clearly. Is there any
portion of this scenario that seems wrong/weird/unclear? Again, I'm open
to suggestion and input. :)
Thanks,
Matthew=20
=20
*************************************=20
This e-mail may contain privileged or confidential material intended for =
the named recipient only.=20
If you are not the named recipient, delete this message and all =
attachments.=20
Unauthorized reviewing, copying, printing, disclosing, or otherwise =
using information in this e-mail is prohibited.=20
We reserve the right to monitor e-mail sent through our network. =20
*************************************=20
|