RE: DiffMerge comments
"Nahum.Wild" <[email protected]> Thu, 8 Apr 2004 09:52:00 +1200
| Newsgroups | gmane.comp.version-control.sourcegear-vault.user |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. ------=_NextPart_000_0011_01C41D4F.25A94A50 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Cool, thanks. A question then. If I checkin a single file is the comment a "item comment" or a "change set comment" or both? Does it depend on where I perform the checkout from? - the "pending change set" area itself or just right clicking on the file and selecting checkin or an IDE. Thanks, Nahum. -----Original Message----- From: Dan Schreiber [mailto:[email protected]] Sent: Thursday, 8 April 2004 05:07 a.m. To: [email protected]; [email protected] Subject: RE: [vault-list] DiffMerge comments OK, I see what you mean. This would work if the appended comments were "item comments", and not "change set comments", meaning they were comments associated with a single file, and not with the whole change set. I'll add it to the list. -----Original Message----- From: [email protected] [mailto:[email protected]]On Behalf Of Nahum.Wild Sent: Tuesday, April 06, 2004 4:20 PM To: [email protected] Subject: RE: [vault-list] DiffMerge comments Sorry, yesterday just didn't seem to be my day. When merging a branches changes back into its (or any other for that matter) trunk I'd like the checkin comments associated with the changes in the branch carried across as well. So if a file as part of a branch has multiple separate commented changes made to it and is then merged with it's trunk I'd like to see those comments included in the merge also. I would assume that all the comments would be appended together with date and user to make a single comment for the merged changes. I think that makes more sense. :o) Nahum. ------=_NextPart_000_0011_01C41D4F.25A94A50 Content-Type: text/html; charset="US-ASCII" Content-Transfer-Encoding: quoted-printable <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD> <META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; = charset=3Dus-ascii"> <META content=3D"MSHTML 6.00.2800.1400" name=3DGENERATOR></HEAD> <BODY> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN = class=3D226244921-07042004>Cool,=20 thanks.</SPAN></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D226244921-07042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN = class=3D226244921-07042004>A=20 question then. If I checkin a single file is the comment a = "item=20 comment" or a "change set comment" or both? Does it depend on = where I=20 perform the checkout from? - the "pending change set" area itself or = just right=20 clicking on the file and selecting checkin or an = IDE.</SPAN></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D226244921-07042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D226244921-07042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D226244921-07042004>Thanks,</SPAN></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D226244921-07042004>Nahum.</SPAN></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D226244921-07042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D226244921-07042004></SPAN></FONT> </DIV> <BLOCKQUOTE dir=3Dltr=20 style=3D"PADDING-LEFT: 5px; MARGIN-LEFT: 5px; BORDER-LEFT: #0000ff 2px = solid; MARGIN-RIGHT: 0px"> <DIV class=3DOutlookMessageHeader dir=3Dltr align=3Dleft><FONT = face=3DTahoma=20 size=3D2>-----Original Message-----<BR><B>From:</B> Dan Schreiber=20 [mailto:[email protected]]<BR><B>Sent:</B> Thursday, 8 April 2004 = 05:07=20 a.m.<BR><B>To:</B> [email protected];=20 [email protected]<BR><B>Subject:</B> RE: [vault-list] = DiffMerge=20 comments<BR><BR></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN = class=3D050465216-07042004>OK,=20 I see what you mean.</SPAN></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D050465216-07042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN = class=3D050465216-07042004>This=20 would work if the appended comments were "item comments", and not = "change set=20 comments", meaning they were comments associated with a single file, = and not=20 with the whole change set. I'll add it to the = list.</SPAN></FONT></DIV> <BLOCKQUOTE dir=3Dltr=20 style=3D"PADDING-LEFT: 5px; MARGIN-LEFT: 5px; BORDER-LEFT: #0000ff 2px = solid; MARGIN-RIGHT: 0px"> <DIV class=3DOutlookMessageHeader dir=3Dltr align=3Dleft><FONT = face=3DTahoma=20 size=3D2>-----Original Message-----<BR><B>From:</B>=20 [email protected]=20 [mailto:[email protected]]<B>On Behalf Of=20 </B>Nahum.Wild<BR><B>Sent:</B> Tuesday, April 06, 2004 4:20 = PM<BR><B>To:</B>=20 [email protected]<BR><B>Subject:</B> RE: [vault-list] = DiffMerge=20 comments<BR><BR></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D038110721-06042004>Sorry, yesterday just didn't seem to be = my=20 day. </SPAN></FONT><FONT face=3DArial color=3D#0000ff = size=3D2><SPAN=20 class=3D038110721-06042004>When merging a branches changes back = into its=20 (or any other for that matter) trunk I'd like the checkin = comments=20 associated with the changes in the branch carried across as=20 well.</SPAN></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D038110721-06042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN = class=3D038110721-06042004>So=20 if a file as part of a branch has multiple separate commented = changes made=20 to it and is then merged with it's trunk I'd like to see those = comments=20 included in the merge also. I would assume that all the = comments would=20 be appended together with date and user to make a single comment for = the=20 merged changes.</SPAN></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D038110721-06042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN = class=3D038110721-06042004>I=20 think that makes more sense. :o)</SPAN></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D038110721-06042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D038110721-06042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D038110721-06042004>Nahum.</SPAN></FONT></DIV> <BLOCKQUOTE dir=3Dltr=20 style=3D"PADDING-LEFT: 5px; MARGIN-LEFT: 5px; BORDER-LEFT: #0000ff = 2px solid; MARGIN-RIGHT: 0px"><FONT=20 face=3DArial color=3D#0000ff=20 size=3D2></FONT> </BLOCKQUOTE></BLOCKQUOTE></BLOCKQUOTE></BODY></HTM= L> ------=_NextPart_000_0011_01C41D4F.25A94A50--