|
»
»
6.0.8
|
View:
New views
3 Messages
—
Rating Filter:
Alert me
|
 |
|
|
|
RE: 6.0.8
by Rekhi, Rohan
::
Rate this Message:
Hi,
I have TortoiseSVN client 1.6.6 on my machine and using it for long. We were trying to merge from a branch to the trunk "Reintegrate the branch" Merge option and it showed many conflicts as listed in file below.Just tried this merge again by doing fresh checkout from trunk and the branch and result was still the same. So when investigated further,for conflicts in few of these files,found out that these files should not have been in conflicts. This time tried merge again with 'Merge Two differnt trees' option and this time Merge had different results and the conflicts where in different files.In fact one of the file in merge was not present in the branch.So it should not have been makred as conflict. So this raises a question what's wrong with the first option.I would appreciate if anybody has to throw some light over this ,if they have faced it in SmartSVN. Thanks and Regards Rohan Rekhi Credit Suisse *: 919 994 5665 *:rohan.rekhi@... ________________________________ From: smartsvn@... [mailto:smartsvn@...] On Behalf Of Jason Hughes Sent: Thursday, October 29, 2009 12:38 PM To: smartsvn@... Subject: [smartsvn] 6.0.8 I have the new build up and running--thanks! The multi-monitor support with negative coordinates makes me verrry happy. JH Jason Hughes President Steel Penny Games, Inc. Austin, TX =============================================================================== Please access the attached hyperlink for an important electronic communications disclaimer: http://www.credit-suisse.com/legal/en/disclaimer_email_ib.html =============================================================================== [Non-text portions of this message have been removed] ------------------------------------ Yahoo! Groups Links <*> To visit your group on the web, go to: http://groups.yahoo.com/group/smartsvn/ <*> Your email settings: Individual Email | Traditional <*> To change settings online go to: http://groups.yahoo.com/group/smartsvn/join (Yahoo! ID required) <*> To change settings via email: mailto:smartsvn-digest@... mailto:smartsvn-fullfeatured@... <*> To unsubscribe from this group, send an email to: smartsvn-unsubscribe@... <*> Your use of Yahoo! Groups is subject to: http://docs.yahoo.com/info/terms/ |
|
|
Re: 6.0.8
by syntevo Support-3
::
Rate this Message:
> So this raises a question what's wrong with the first option.I would
> appreciate if anybody has to throw some light over this ,if they have > faced it in SmartSVN. Did you try to reintegrate merge with SmartSVN (though it will most likely result in the same conflicts)? Was the two-trees merge actually equivalent to the reintegrate merge, according to: http://blogs.open.collab.net/svn/2008/07/subversion-merg.html -- Best regards, Marc Strapetz ============= syntevo GmbH http://www.syntevo.com http://blog.syntevo.com "Rekhi, Rohan" <rohan.rekhi@...> wrote: > Hi, > > I have TortoiseSVN client 1.6.6 on my machine and using it for long. > > We were trying to merge from a branch to the trunk "Reintegrate the > branch" Merge option and it showed many conflicts as listed in file > below.Just tried this merge again by doing fresh checkout from trunk and > the branch and result was still the same. > > So when investigated further,for conflicts in few of these files,found > out that these files should not have been in conflicts. > > This time tried merge again with 'Merge Two differnt trees' option and > this time Merge had different results and the conflicts where in > different files.In fact one of the file in merge was not present in the > branch.So it should not have been makred as conflict. > > So this raises a question what's wrong with the first option.I would > appreciate if anybody has to throw some light over this ,if they have > faced it in SmartSVN. > > Thanks and Regards > Rohan Rekhi > Credit Suisse > *: 919 994 5665 > *:rohan.rekhi@... > > > > ________________________________ > > From: smartsvn@... [mailto:smartsvn@...] On > Behalf Of Jason Hughes > Sent: Thursday, October 29, 2009 12:38 PM > To: smartsvn@... > Subject: [smartsvn] 6.0.8 > > > > > I have the new build up and running--thanks! The multi-monitor support > with negative coordinates makes me verrry happy. > > JH > > Jason Hughes > President > Steel Penny Games, Inc. > Austin, TX > > > > > > =============================================================================== > > Please access the attached hyperlink for an important electronic > communications disclaimer: > http://www.credit-suisse.com/legal/en/disclaimer_email_ib.html > =============================================================================== > > > > > [Non-text portions of this message have been removed] > > > > ------------------------------------ > > Yahoo! Groups Links > > > > ------------------------------------ Yahoo! Groups Links <*> To visit your group on the web, go to: http://groups.yahoo.com/group/smartsvn/ <*> Your email settings: Individual Email | Traditional <*> To change settings online go to: http://groups.yahoo.com/group/smartsvn/join (Yahoo! ID required) <*> To change settings via email: mailto:smartsvn-digest@... mailto:smartsvn-fullfeatured@... <*> To unsubscribe from this group, send an email to: smartsvn-unsubscribe@... <*> Your use of Yahoo! Groups is subject to: http://docs.yahoo.com/info/terms/ |
| Free embeddable forum powered by Nabble | Forum Help |
