RE: DiffMerge comments
"Nahum.Wild" <[email protected]> Wed, 7 Apr 2004 09:20:17 +1200
| Newsgroups | gmane.comp.version-control.sourcegear-vault.user |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. ------=_NextPart_000_000A_01C41C81.8B251A40 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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. -----Original Message----- From: Dan Schreiber [mailto:[email protected]] Sent: Wednesday, 7 April 2004 01:14 a.m. To: [email protected]; [email protected] Subject: RE: [vault-list] DiffMerge comments Not sure what you mean - in Merge Branches wizard you can enter a comment that gets put in as the change set comment after the merge branches is done, but there isn't really a capability in the diff/merge window to enter comments. -Dan -----Original Message----- From: [email protected] [mailto:[email protected]]On Behalf Of Nahum.Wild Sent: Monday, April 05, 2004 9:11 PM To: [email protected] Subject: RE: [vault-list] DiffMerge comments Have you got on your list the option of the user being able to bring across checkin comments on the final checkin as well? Cheers, Nahum Wild Software Innovator & Process Consultant PayGlobal ------=_NextPart_000_000A_01C41C81.8B251A40 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=3D038110721-06042004>Sorry,=20 yesterday just didn't seem to be my day. </SPAN></FONT><FONT = face=3DArial=20 color=3D#0000ff size=3D2><SPAN class=3D038110721-06042004>When merging a = branches=20 changes back into its (or any other for that matter) trunk I'd = like=20 the checkin comments 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 if=20 a file as part of a branch has multiple separate commented changes made = to it=20 and is then merged with it's trunk I'd like to see those comments = included in=20 the merge also. I would assume that all the comments would be = appended=20 together with date and user to make a single comment for the merged=20 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"> <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> Wednesday, 7 April 2004 = 01:14=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=3D920090813-06042004>Not=20 sure what you mean - in Merge Branches wizard you can enter a comment = that=20 gets put in as the change set comment after the merge branches is = done, but=20 there isn't really a capability in the diff/merge window to enter=20 comments.</SPAN></FONT></DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D920090813-06042004></SPAN></FONT> </DIV> <DIV><FONT face=3DArial color=3D#0000ff size=3D2><SPAN=20 class=3D920090813-06042004>-Dan</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> Monday, April 05, 2004 9:11 = PM<BR><B>To:</B>=20 [email protected]<BR><B>Subject:</B> RE: [vault-list] = DiffMerge=20 comments<BR><BR></FONT></DIV> <DIV><SPAN class=3D546060902-06042004><FONT face=3DArial = size=3D2>Have you got on=20 your list the option of the user being able to bring across = checkin=20 comments on the final checkin as well?</FONT></SPAN></DIV> <DIV><SPAN class=3D546060902-06042004><FONT face=3DArial=20 size=3D2></FONT></SPAN> </DIV> <DIV><SPAN class=3D546060902-06042004><FONT face=3DArial=20 size=3D2></FONT></SPAN> </DIV> <DIV><SPAN class=3D546060902-06042004><FONT face=3DArial=20 size=3D2></FONT></SPAN> </DIV> <DIV><SPAN class=3D546060902-06042004><FONT face=3DArial=20 size=3D2>Cheers,</FONT></SPAN></DIV> <DIV><SPAN class=3D546060902-06042004><FONT face=3DArial=20 size=3D2></FONT></SPAN> </DIV> <DIV><SPAN class=3D546060902-06042004><FONT face=3DArial = size=3D2>Nahum=20 Wild</FONT></SPAN></DIV> <DIV><SPAN class=3D546060902-06042004><FONT face=3DArial = size=3D2>Software=20 Innovator & Process Consultant</FONT></SPAN></DIV> <DIV><SPAN class=3D546060902-06042004><FONT face=3DArial=20 size=3D2>PayGlobal</FONT></SPAN></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_000A_01C41C81.8B251A40--